kalle Tue Jun 23 06:56:45 2009 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS /php-src/ext/standard config.w32 /php-src/win32/build config.w32.h.in Log: MFH: Move these defines to config.w32.h Also credit Pierre for the inet_ntop()/inet_pton() implementations http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.644&r2=1.2027.2.547.2.965.2.645&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.644 php-src/NEWS:1.2027.2.547.2.965.2.645 --- php-src/NEWS:1.2027.2.547.2.965.2.644 Mon Jun 22 22:14:37 2009 +++ php-src/NEWS Tue Jun 23 06:56:45 2009 @@ -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 @@ - 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 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.w32?r1=1.4.2.2.2.1.2.6&r2=1.4.2.2.2.1.2.7&diff_format=u Index: php-src/ext/standard/config.w32 diff -u php-src/ext/standard/config.w32:1.4.2.2.2.1.2.6 php-src/ext/standard/config.w32:1.4.2.2.2.1.2.7 --- php-src/ext/standard/config.w32:1.4.2.2.2.1.2.6 Fri Jan 16 01:00:22 2009 +++ php-src/ext/standard/config.w32 Tue Jun 23 06:56:45 2009 @@ -1,12 +1,9 @@ // vim:ft=javascript -// $Id: config.w32,v 1.4.2.2.2.1.2.6 2009/01/16 01:00:22 pajoye Exp $ +// $Id: config.w32,v 1.4.2.2.2.1.2.7 2009/06/23 06:56:45 kalle Exp $ 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 @@ 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") } http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.7.2.4.2.3.2.13&r2=1.7.2.4.2.3.2.14&diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.13 php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.14 --- php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.13 Fri May 29 08:11:36 2009 +++ php-src/win32/build/config.w32.h.in Tue Jun 23 06:56:45 2009 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.7.2.4.2.3.2.13 2009/05/29 08:11:36 pajoye Exp $ + $Id: config.w32.h.in,v 1.7.2.4.2.3.2.14 2009/06/23 06:56:45 kalle Exp $ */ /* Define the minimum supported version */ @@ -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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php