5 files changed, 29 insertions, 1 deletions
diff --git a/sapi/apache/mod_php5.h b/sapi/apache/mod_php5.h
index 1daa476c7e..7533530de5 100644
--- a/sapi/apache/mod_php5.h
+++ b/sapi/apache/mod_php5.h
@@ -44,6 +44,12 @@ extern php_apache_info_struct php_apache_info;
 #define AP(v) (php_apache_info.v)
 #endif
 
+/* fix for gcc4 visibility patch */
+#ifndef PHP_WIN32
+# undef MODULE_VAR_EXPORT
+# define MODULE_VAR_EXPORT PHPAPI
+#endif
+
 #endif							/* MOD_PHP5_H */
 
 /*
diff --git a/sapi/apache2filter/php_apache.h b/sapi/apache2filter/php_apache.h
index 78050a7de5..53bfb9c223 100644
--- a/sapi/apache2filter/php_apache.h
+++ b/sapi/apache2filter/php_apache.h
@@ -74,4 +74,10 @@ static long php_apache_fteller_stream(void * TSRMLS_DC);
 
 #define APR_ARRAY_FOREACH_CLOSE() }}
 
+/* fix for gcc4 visibility patch */
+#ifndef PHP_WIN32
+# undef AP_MODULE_DECLARE_DATA
+# define AP_MODULE_DECLARE_DATA PHPAPI
+#endif
+
 #endif /* PHP_APACHE_H */
diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h
index 3d41439170..af9da3a230 100644
--- a/sapi/apache2handler/php_apache.h
+++ b/sapi/apache2handler/php_apache.h
@@ -82,5 +82,10 @@ extern php_apache2_info_struct php_apache2_info;
 #define AP2(v) (php_apache2_info.v)
 #endif
 
+/* fix for gcc4 visibility patch */
+#ifndef PHP_WIN32
+# undef AP_MODULE_DECLARE_DATA
+# define AP_MODULE_DECLARE_DATA PHPAPI
+#endif
 
 #endif /* PHP_APACHE_H */
diff --git a/sapi/apache_hooks/mod_php5.h b/sapi/apache_hooks/mod_php5.h
index 0d61bf8982..1549dbf263 100644
--- a/sapi/apache_hooks/mod_php5.h
+++ b/sapi/apache_hooks/mod_php5.h
@@ -71,6 +71,13 @@ extern php_apache_info_struct php_apache_info;
 #define AP_LOGGING 10
 #define AP_CLEANUP 11
 
+
+/* fix for gcc4 visibility patch */
+#ifndef PHP_WIN32
+# undef MODULE_VAR_EXPORT
+# define MODULE_VAR_EXPORT PHPAPI
+#endif
+
 #endif							/* MOD_PHP5_H */
 
 /*
diff --git a/sapi/pi3web/pi3web_sapi.h b/sapi/pi3web/pi3web_sapi.h
index 9300241d44..d229fec53f 100644
--- a/sapi/pi3web/pi3web_sapi.h
+++ b/sapi/pi3web/pi3web_sapi.h
@@ -9,8 +9,12 @@
 #		define MODULE_API __declspec(dllimport) 
 #	endif
 #else
+#	if defined(__GNUC__) && __GNUC__ >= 4
+#		define MODULE_API __attribute__ ((visibility("default")))
+#	else
+#		define MODULE_API
+#	endif
 #	define far
-#	define MODULE_API
 
 	typedef int BOOL;
 	typedef void far *LPVOID;