cvs: php-src /win32 inet.c inet.h

pajoye Sat Aug 23 19:55:44 2008 UTC Modified files: /php-src/win32 inet.c inet.h Log: - MFB: fix logic, build correctly when the build targets xp/2k http://cvs.php.net/viewvc.cgi/php-src/win32/inet.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/win32/inet.c diff -u php-src/win32/inet.c:1.1 php-src/win32/inet.c:1.2 --- php-src/win32/inet.c:1.1 Thu Aug 21 23:37:40 2008 +++ php-src/win32/inet.c Sat Aug 23 19:55:44 2008 @@ -1,5 +1,5 @@ -#if _MSC_VER < 1500 #include "config.w32.h" +#if (_WIN32_WINNT < 0x0600) /* Vita/2k8 have these functions */ #include "php.h" #include <winsock2.h> #include <windows.h> http://cvs.php.net/viewvc.cgi/php-src/win32/inet.h?r1=1.1&r2=1.2&diff_format=u Index: php-src/win32/inet.h diff -u php-src/win32/inet.h:1.1 php-src/win32/inet.h:1.2 --- php-src/win32/inet.h:1.1 Thu Aug 21 23:37:40 2008 +++ php-src/win32/inet.h Sat Aug 23 19:55:44 2008 @@ -2,8 +2,7 @@ # include <In6addr.h> #endif #include <Ws2tcpip.h> - -#if _MSC_VER < 1500 +#if (_WIN32_WINNT < 0x0600) /* Vita/2k8 have these functions */ 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);