- more fixes for inet_* with vc9/xp

diff --git a/ext/standard/flock_compat.c b/ext/standard/flock_compat.c
index d5b262ef9cb1a8b7750288c5ff7d700854b17f32..b9db317ec58c6117195961fad1ca3893a8066195 100644 (file)
--- a/ext/standard/flock_compat.c
+++ b/ext/standard/flock_compat.c
@@ -163,6 +163,7 @@ PHPAPI int php_flock(int fd, int operation)
 }
 #endif
 
+#ifndef PHP_WIN32
 #if !(HAVE_INET_ATON)
 /* {{{ inet_aton
  * Check whether "cp" is a valid ascii representation
@@ -226,7 +227,7 @@ int inet_aton(const char *cp, struct in_addr *ap)
 }
 /* }}} */
 #endif /* !HAVE_INET_ATON */
-
+#endif /* !PHP_WIN32 */
 /*
  * Local variables:
  * tab-width: 4

diff --git a/ext/standard/flock_compat.h b/ext/standard/flock_compat.h
index 3e0fcd7c33a509f0e1810b8e839d9e1fb4a5935f..84f1b6b01129a4be5c7654d3c7ae561c1157c6ba 100644 (file)
--- a/ext/standard/flock_compat.h
+++ b/ext/standard/flock_compat.h
@@ -49,7 +49,9 @@ PHPAPI int flock(int fd, int operation);
 #include <arpa/inet.h>
 #endif
 
+#ifndef PHP_WIN32
 extern int inet_aton(const char *, struct in_addr *);
 #endif
+#endif
 
 #endif /* FLOCK_COMPAT_H */

diff --git a/win32/inet.h b/win32/inet.h
index 7988bdb9e259e03b8d9f6369067e9aee06a25c7d..9e08094dbef93ee8ef63dbecf37c835a6f1f99af 100644 (file)
--- a/win32/inet.h
+++ b/win32/inet.h
@@ -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);