svn: /php/php-src/ branches/PHP_5_3/ext/sockets/php_sockets.h branches/PHP_5_3/ext/sockets/sockets.c trunk/ext/sockets/php_sockets.h
trunk/ext/sockets/sockets.c
| From: | Pierre-Alain Joye | Date: | Fri, 04 Sep 2009 19:53:39 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/sockets/php_sockets.h branches/PHP_5_3/ext/sockets/sockets.c trunk/ext/sockets/php_sockets.h trunk/ext/sockets/sockets.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60324@lists.php.net to get a copy of this message | ||
pajoye Fri, 04 Sep 2009 19:53:39 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288067
Log:
- #49464, fix build
Bug: http://bugs.php.net/49464 (Open) php_sockets build
broken
Changed paths:
U php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h
U php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
U php/php-src/trunk/ext/sockets/php_sockets.h
U php/php-src/trunk/ext/sockets/sockets.c
Modified: php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h 2009-09-04 19:36:02 UTC (rev 288066)
+++ php/php-src/branches/PHP_5_3/ext/sockets/php_sockets.h 2009-09-04 19:53:39 UTC (rev 288067)
@@ -73,7 +73,9 @@
#ifndef PHP_WIN32
typedef int PHP_SOCKET;
+# define PHP_SOCKETS_API PHPAPI
#else
+# define PHP_SOCKETS_API __declspec(dllexport)
typedef SOCKET PHP_SOCKET;
#endif
@@ -91,7 +93,7 @@
};
#endif
-PHPAPI int php_sockets_le_socket(void);
+PHP_SOCKETS_API int php_sockets_le_socket(void);
/* Prototypes */
#ifdef ilia_0 /* not needed, only causes a compiler warning */
Modified: php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-09-04 19:36:02 UTC (rev 288066)
+++ php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2009-09-04 19:53:39 UTC (rev 288067)
@@ -323,7 +323,7 @@
/* inet_ntop should be used instead of inet_ntoa */
int inet_ntoa_lock = 0;
-PHPAPI int php_sockets_le_socket(void) /* {{{ */
+PHP_SOCKETS_API int php_sockets_le_socket(void) /* {{{ */
{
return le_socket;
}
Modified: php/php-src/trunk/ext/sockets/php_sockets.h
===================================================================
--- php/php-src/trunk/ext/sockets/php_sockets.h 2009-09-04 19:36:02 UTC (rev 288066)
+++ php/php-src/trunk/ext/sockets/php_sockets.h 2009-09-04 19:53:39 UTC (rev 288067)
@@ -73,8 +73,10 @@
#ifndef PHP_WIN32
typedef int PHP_SOCKET;
+# define PHP_SOCKETS_API __declspec(dllexport)
#else
typedef SOCKET PHP_SOCKET;
+# define PHP_SOCKETS_API PHPAPI
#endif
typedef struct {
@@ -91,7 +93,7 @@
};
#endif
-PHPAPI int php_sockets_le_socket(void);
+PHP_SOCKETS_API int php_sockets_le_socket(void);
/* Prototypes */
#ifdef ilia_0 /* not needed, only causes a compiler warning */
Modified: php/php-src/trunk/ext/sockets/sockets.c
===================================================================
--- php/php-src/trunk/ext/sockets/sockets.c 2009-09-04 19:36:02 UTC (rev 288066)
+++ php/php-src/trunk/ext/sockets/sockets.c 2009-09-04 19:53:39 UTC (rev 288067)
@@ -323,7 +323,8 @@
/* inet_ntop should be used instead of inet_ntoa */
int inet_ntoa_lock = 0;
-PHPAPI int php_sockets_le_socket(void) /* {{{ */
+
+PHP_SOCKETS_API int php_sockets_le_socket(void) /* {{{ */
{
return le_socket;
}