From 1cabc8cd3a3bf5c12a8ece9efb59e3f5381f1ae5 Mon Sep 17 00:00:00 2001 From: Kalle Sommer Nielsen Date: Mon, 24 May 2010 07:44:00 +0000 Subject: Allow ereg to be built as shared on Windows ## I know that we may remove ereg in trunk, but since the core doesn't depend on ## ereg, then I don't see any reason not to allow this --- ext/ereg/php_ereg.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'ext/ereg/php_ereg.h') diff --git a/ext/ereg/php_ereg.h b/ext/ereg/php_ereg.h index ad7d546338..9c489d742a 100644 --- a/ext/ereg/php_ereg.h +++ b/ext/ereg/php_ereg.h @@ -27,7 +27,15 @@ extern zend_module_entry ereg_module_entry; #define phpext_ereg_ptr &ereg_module_entry -PHPAPI char *php_ereg_replace(const char *pattern, const char *replace, const char *string, int icase, int extended TSRMLS_DC); +#ifdef PHP_WIN32 +# define PHP_EREG_API __declspec(dllexport) +#elif defined(__GNUC__) && __GNUC__ >= 4 +# define PHP_EREG_API __attribute__ ((visibility("default"))) +#else +# define PHP_EREG_API +#endif + +PHP_EREG_API char *php_ereg_replace(const char *pattern, const char *replace, const char *string, int icase, int extended TSRMLS_DC); PHP_FUNCTION(ereg); PHP_FUNCTION(eregi); @@ -35,7 +43,7 @@ PHP_FUNCTION(eregi_replace); PHP_FUNCTION(ereg_replace); PHP_FUNCTION(split); PHP_FUNCTION(spliti); -PHPAPI PHP_FUNCTION(sql_regcase); +PHP_EREG_API PHP_FUNCTION(sql_regcase); ZEND_BEGIN_MODULE_GLOBALS(ereg) HashTable ht_rc; @@ -43,8 +51,6 @@ ZEND_BEGIN_MODULE_GLOBALS(ereg) ZEND_END_MODULE_GLOBALS(ereg) /* Module functions */ -PHP_MINIT_FUNCTION(ereg); -PHP_MSHUTDOWN_FUNCTION(ereg); PHP_MINFO_FUNCTION(ereg); #ifdef ZTS @@ -53,4 +59,6 @@ PHP_MINFO_FUNCTION(ereg); #define EREG(v) (ereg_globals.v) #endif +ZEND_EXTERN_MODULE_GLOBALS(ereg) + #endif /* REG_H */ -- cgit v1.2.1