diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2009-06-23 06:56:45 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2009-06-23 06:56:45 +0000 |
| commit | 220c68d54a6d6caeeebd10260ce6e6e337c4f792 (patch) | |
| tree | 070ffcee1a82786e07f329c37a02a3c2448d1d48 | |
| parent | 3410350caaf37383544486bd9aa10c746c6017f8 (diff) | |
| download | php-git-220c68d54a6d6caeeebd10260ce6e6e337c4f792.tar.gz | |
MFH: Move these defines to config.w32.h
Also credit Pierre for the inet_ntop()/inet_pton() implementations
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/standard/config.w32 | 5 | ||||
| -rw-r--r-- | win32/build/config.w32.h.in | 4 |
3 files changed, 7 insertions, 6 deletions
@@ -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 5744d9399c..869b6e4e9c 100644 --- 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 ddb584927b..71ec862ba4 100644 --- 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 |