svn: /php/php-src/branches/PHP_5_3_1/ext/sockets/ php_sockets.h sockets.c
| From: | Pierre-Alain Joye | Date: | Fri, 09 Oct 2009 14:22:29 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3_1/ext/sockets/ php_sockets.h sockets.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60614@lists.php.net to get a copy of this message | ||
pajoye Fri, 09 Oct 2009 14:22:29 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=289417
Log:
- merge: #49464, fix build
Bug: http://bugs.php.net/49464 (Closed) php_sockets build
broken
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/sockets/php_sockets.h
U php/php-src/branches/PHP_5_3_1/ext/sockets/sockets.c
Modified: php/php-src/branches/PHP_5_3_1/ext/sockets/php_sockets.h
===================================================================
--- php/php-src/branches/PHP_5_3_1/ext/sockets/php_sockets.h 2009-10-09 14:20:17 UTC (rev 289416)
+++ php/php-src/branches/PHP_5_3_1/ext/sockets/php_sockets.h 2009-10-09 14:22:29 UTC (rev 289417)
@@ -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_1/ext/sockets/sockets.c
===================================================================
--- php/php-src/branches/PHP_5_3_1/ext/sockets/sockets.c 2009-10-09 14:20:17 UTC (rev 289416)
+++ php/php-src/branches/PHP_5_3_1/ext/sockets/sockets.c 2009-10-09 14:22:29 UTC (rev 289417)
@@ -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;
}