svn: /php/php-src/branches/ PHP_5_3/win32/inet.h PHP_5_4/win32/inet.h
| From: | Pierre Joye | Date: | Mon, 05 Mar 2012 20:53:40 +0000 |
| Subject: | svn: /php/php-src/branches/ PHP_5_3/win32/inet.h PHP_5_4/win32/inet.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67836@lists.php.net to get a copy of this message | ||
pajoye Mon, 05 Mar 2012 20:53:40 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=323926
Log:
- fix bug #61290, fix build
Bug: https://bugs.php.net/61290 (Open) php_sockets build
failure - unresolved external symbol _inet_aton
Changed paths:
U php/php-src/branches/PHP_5_3/win32/inet.h
U php/php-src/branches/PHP_5_4/win32/inet.h
Modified: php/php-src/branches/PHP_5_3/win32/inet.h
===================================================================
--- php/php-src/branches/PHP_5_3/win32/inet.h 2012-03-05 20:14:55 UTC (rev 323925)
+++ php/php-src/branches/PHP_5_3/win32/inet.h 2012-03-05 20:53:40 UTC (rev 323926)
@@ -3,7 +3,7 @@
#endif
#include <Ws2tcpip.h>
-#if (_WIN32_WINNT <= 0x500)
+#if (_WIN32_WINNT < 0x0600)
PHPAPI int inet_pton(int af, const char* src, void* dst);
PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size);
PHPAPI int inet_aton(const char *cp, struct in_addr *inp);
Modified: php/php-src/branches/PHP_5_4/win32/inet.h
===================================================================
--- php/php-src/branches/PHP_5_4/win32/inet.h 2012-03-05 20:14:55 UTC (rev 323925)
+++ php/php-src/branches/PHP_5_4/win32/inet.h 2012-03-05 20:53:40 UTC (rev 323926)
@@ -3,7 +3,7 @@
#endif
#include <Ws2tcpip.h>
-#if (_WIN32_WINNT <= 0x502)
+#if (_WIN32_WINNT < 0x0600)
PHPAPI int inet_pton(int af, const char* src, void* dst);
PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size);
PHPAPI int inet_aton(const char *cp, struct in_addr *inp);