From: Pierre Joye Date: Fri, 9 Oct 2009 14:22:29 +0000 (+0000) Subject: - merge: #49464, fix build X-Git-Tag: php-5.3.1RC2~57 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdee41505c6a433bbcff17c8f29ea9c1489fb4ac;p=php - merge: #49464, fix build --- diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h index 23e350c315..3738ed46c6 100644 --- a/ext/sockets/php_sockets.h +++ b/ext/sockets/php_sockets.h @@ -73,7 +73,9 @@ PHP_FUNCTION(socket_clear_error); #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 @@ struct sockaddr_un { }; #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 */ diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 3d32b712cc..0b635f399c 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -323,7 +323,7 @@ ZEND_GET_MODULE(sockets) /* 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; }