summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Schindler <thetaphi@php.net>2009-11-17 21:17:49 +0000
committerUwe Schindler <thetaphi@php.net>2009-11-17 21:17:49 +0000
commitbdef3ee3508317bd195101214ca377f19746aece (patch)
treea8817baccb1e9e11baaf8be47649d0544521d3f7
parent0ab68199d4bba14b29b46937040f311414013c32 (diff)
downloadphp-git-bdef3ee3508317bd195101214ca377f19746aece.tar.gz
Fix bug #50140: With default compilation option, php symbols are unresolved for nsapi
-rw-r--r--NEWS2
-rw-r--r--sapi/nsapi/nsapi.c6
2 files changed, 8 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index e631fd8fce..82a7fe64c7 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ PHP NEWS
- Fixed memory leak in extension loading when an error occurs on Windows.
(Pierre)
+- Fixed bug #50140 (With default compilation option, php symbols are
+ unresolved for nsapi). (Uwe Schindler)
- Fixed bug #50174 (Incorrectly matched docComment). (Felipe)
- Fixed bug #50158 (FILTER_VALIDATE_EMAIL fails with valid addresses
containing = or ?). (Pierrick)
diff --git a/sapi/nsapi/nsapi.c b/sapi/nsapi/nsapi.c
index 4ab461c2be..5fb1c3750c 100644
--- a/sapi/nsapi/nsapi.c
+++ b/sapi/nsapi/nsapi.c
@@ -68,6 +68,12 @@
*/
#include "nsapi.h"
+/* fix for gcc4 visibility issue */
+#ifndef PHP_WIN32
+# undef NSAPI_PUBLIC
+# define NSAPI_PUBLIC PHPAPI
+#endif
+
#define NSLS_D struct nsapi_request_context *request_context
#define NSLS_DC , NSLS_D
#define NSLS_C request_context