properly export ext/odbc globals

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 11fecbd617ffd3239fa82a4d1358950c16b328c3..36967b7e006f30723cff0a337e9b30f7600a833c 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -387,7 +387,7 @@ const zend_function_entry odbc_functions[] = {
 };
 /* }}} */
 
-ZEND_DECLARE_MODULE_GLOBALS(odbc)
+PHP_ODBC_API ZEND_DECLARE_MODULE_GLOBALS(odbc)
 static PHP_GINIT_FUNCTION(odbc);
 
 /* {{{ odbc_module_entry

diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h
index 857397b4678ab80892230311a1a91b18ac0772ef..d5b1eda0de3318117224239d6ae4a1ce921a8f61 100644 (file)
--- a/ext/odbc/php_odbc.h
+++ b/ext/odbc/php_odbc.h
@@ -101,6 +101,14 @@ PHP_FUNCTION(odbc_primarykeys);
 PHP_FUNCTION(odbc_specialcolumns);
 PHP_FUNCTION(odbc_statistics);
 
+#ifdef PHP_WIN32
+# define PHP_ODBC_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+# define PHP_ODBC_API __attribute__ ((visibility("default")))
+#else
+# define PHP_ODBC_API
+#endif
+
 #else
 
 #define odbc_module_ptr NULL

diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
index 9d8799c5fba8358ffe26021c6e8d9c19c64c4ff2..9270a01f38e22ed36e6cbbde923c235d5823b243 100644 (file)
--- a/ext/odbc/php_odbc_includes.h
+++ b/ext/odbc/php_odbc_includes.h
@@ -296,7 +296,7 @@ void odbc_sql_error(ODBC_SQL_ERROR_PARAMS);
 #endif
 #define IS_SQL_BINARY(x) (x == SQL_BINARY || x == SQL_VARBINARY || x == SQL_LONGVARBINARY)
 
-PHPAPI ZEND_EXTERN_MODULE_GLOBALS(odbc)
+PHP_ODBC_API ZEND_EXTERN_MODULE_GLOBALS(odbc)
 #define ODBCG(v) ZEND_MODULE_GLOBALS_ACCESSOR(odbc, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_ODBC)