MFH: Move these defines to config.w32.h

Also credit Pierre for the inet_ntop()/inet_pton() implementations

diff --git a/NEWS b/NEWS
index 5c1b57cbdecf98f54486d54880c90e4c9537b25c..b01e48fc3c5f395956abb2d19f4b3d98e28b9352 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-PHP                                                                        NEWS
+PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2009, PHP 5.3.0 RC 5
 - Fixed bug #48641 (tmpfile() uses old parameter parsing).
@@ -744,7 +744,7 @@ PHP                                                                        NEWS
 - Added PREG_BAD_UTF8_OFFSET_ERROR constant. (Nuno)
 - Added native support for asinh(), acosh(), atanh(), log1p() and expm1().
   (Kalle)
-- Added inet_pton() and inet_ntop() also for Windows platforms. (Kalle)
+- Added inet_pton() and inet_ntop() also for Windows platforms. (Kalle, Pierre)
 - Added mcrypt_create_iv() also for Windows platforms. (Pierre)
 
 - Fixed html_entity_decode() incorrectly converting numeric html entities

diff --git a/ext/standard/config.w32 b/ext/standard/config.w32
index 5744d9399cd0757af25f8a5d051b34764eecb42d..869b6e4e9c943dce27614c6396a36b976694609f 100644 (file)
--- a/ext/standard/config.w32
+++ b/ext/standard/config.w32
@@ -4,9 +4,6 @@
 ARG_WITH("config-file-scan-dir", "Dir to check for additional php ini files", "");
 
 AC_DEFINE("PHP_CONFIG_FILE_SCAN_DIR", PHP_CONFIG_FILE_SCAN_DIR);
-AC_DEFINE("HAVE_INET_PTON", 1);
-AC_DEFINE("HAVE_INET_NTOP", 1);
-
 AC_DEFINE("PHP_USE_PHP_CRYPT_R", 1);
 
 CHECK_HEADER_ADD_INCLUDE("timelib_config.h", "CFLAGS_STANDARD", "ext/date/lib");
@@ -26,5 +23,5 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
        streamsfuncs.c http.c flock_compat.c", false /* never shared */);
 
 if (PHP_MBREGEX != "no") {
-   CHECK_HEADER_ADD_INCLUDE("oniguruma.h", "CFLAGS_STANDARD", PHP_MBREGEX + ";ext\\mbstring\\oniguruma")   
+       CHECK_HEADER_ADD_INCLUDE("oniguruma.h", "CFLAGS_STANDARD", PHP_MBREGEX + ";ext\\mbstring\\oniguruma")   
 }

diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index ddb584927b7d869748a5bad3f6841fc70acf29fe..71ec862ba4877ec13a201bdee1fdc68418a027e2 100644 (file)
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -156,6 +156,10 @@
 /* Win32 support proc_open */
 #define PHP_CAN_SUPPORT_PROC_OPEN 1
 
+/* inet_ntop() / inet_pton() */
+#define HAVE_INET_PTON 1
+#define HAVE_INET_NTOP 1
+
 #define HAVE_MBLEN
 
 #undef HAVE_ATOF_ACCEPTS_NAN