From: Anatol Belski <ab@php.net>
Date: Sun, 2 Aug 2015 11:05:10 +0000 (+0200)
Subject: properly export ext/odbc globals
X-Git-Tag: php-7.0.0beta3~5^2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c4bbf0f47cc5050196042f4c4b473ee4b9badb7;p=php

properly export ext/odbc globals
---

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 11fecbd617..36967b7e00 100644
--- 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 857397b467..d5b1eda0de 100644
--- 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 9d8799c5fb..9270a01f38 100644
--- 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)