pajoye Sat Aug 23 20:31:27 2008 UTC Modified files: /php-src/win32 inet.h /php-src/ext/standard flock_compat.h flock_compat.c Log: - more fixes for inet_* with vc9/xp http://cvs.php.net/viewvc.cgi/php-src/win32/inet.h?r1=1.2&r2=1.3&diff_format=u Index: php-src/win32/inet.h diff -u php-src/win32/inet.h:1.2 php-src/win32/inet.h:1.3 --- php-src/win32/inet.h:1.2 Sat Aug 23 19:55:44 2008 +++ php-src/win32/inet.h Sat Aug 23 20:31:26 2008 @@ -1,7 +1,9 @@ +#include "config.w32.h" #if _MSC_VER >= 1500 # include <In6addr.h> #endif #include <Ws2tcpip.h> + #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); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/flock_compat.h?r1=1.23&r2=1.24&diff_format=u Index: php-src/ext/standard/flock_compat.h diff -u php-src/ext/standard/flock_compat.h:1.23 php-src/ext/standard/flock_compat.h:1.24 --- php-src/ext/standard/flock_compat.h:1.23 Mon Dec 31 07:12:15 2007 +++ php-src/ext/standard/flock_compat.h Sat Aug 23 20:31:27 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: flock_compat.h,v 1.23 2007/12/31 07:12:15 sebastian Exp $ */ +/* $Id: flock_compat.h,v 1.24 2008/08/23 20:31:27 pajoye Exp $ */ #ifndef FLOCK_COMPAT_H #define FLOCK_COMPAT_H @@ -49,7 +49,9 @@ #include <arpa/inet.h> #endif +#ifndef PHP_WIN32 extern int inet_aton(const char *, struct in_addr *); #endif +#endif #endif /* FLOCK_COMPAT_H */ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/flock_compat.c?r1=1.34&r2=1.35&diff_format=u Index: php-src/ext/standard/flock_compat.c diff -u php-src/ext/standard/flock_compat.c:1.34 php-src/ext/standard/flock_compat.c:1.35 --- php-src/ext/standard/flock_compat.c:1.34 Thu Aug 21 23:37:40 2008 +++ php-src/ext/standard/flock_compat.c Sat Aug 23 20:31:27 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: flock_compat.c,v 1.34 2008/08/21 23:37:40 pajoye Exp $ */ +/* $Id: flock_compat.c,v 1.35 2008/08/23 20:31:27 pajoye Exp $ */ #include "php.h" #include <errno.h> @@ -163,6 +163,7 @@ } #endif +#ifndef PHP_WIN32 #if !(HAVE_INET_ATON) /* {{{ inet_aton * Check whether "cp" is a valid ascii representation @@ -226,7 +227,7 @@ } /* }}} */ #endif /* !HAVE_INET_ATON */ - +#endif /* !PHP_WIN32 */ /* * Local variables: * tab-width: 4
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php