thetaphi                                 Tue, 17 Nov 2009 21:17:49 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=290887

Log:
Fix bug #50140: With default compilation option, php symbols are unresolved for 
nsapi

Bug: http://bugs.php.net/50140 (Feedback) [PATCH] With default compilation 
option, php symbols are unresolved for nsapi
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
    U   php/php-src/trunk/sapi/nsapi/nsapi.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2009-11-17 20:41:47 UTC (rev 290886)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-11-17 21:17:49 UTC (rev 290887)
@@ -21,6 +21,8 @@
 - 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)

Modified: php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c     2009-11-17 20:41:47 UTC 
(rev 290886)
+++ php/php-src/branches/PHP_5_3/sapi/nsapi/nsapi.c     2009-11-17 21:17:49 UTC 
(rev 290887)
@@ -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

Modified: php/php-src/trunk/sapi/nsapi/nsapi.c
===================================================================
--- php/php-src/trunk/sapi/nsapi/nsapi.c        2009-11-17 20:41:47 UTC (rev 
290886)
+++ php/php-src/trunk/sapi/nsapi/nsapi.c        2009-11-17 21:17:49 UTC (rev 
290887)
@@ -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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to