MFH usleep fix, and BFN.

diff --git a/NEWS b/NEWS
index eca3dcd6a05fc448dad1b56285ddc79d40509373..c8282961b77d2ff61747c2da01f2e626e7cab66d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2004, PHP 5.0.1
 - Improved and moved ActiveScript SAPI to PECL.  (Wez)
-- Fixed but #29437 (Possible crash inside array_walk_recursive()). (Ilia)
+- Fixed bug #29474 (win32: usleep() doesn't work). (Wez)
+- Fixed bug #29449 (win32: feof() hangs on empty tcp stream). (Wez)
+- Fixed bug #29437 (Possible crash inside array_walk_recursive()). (Ilia)
 - Fixed bug #29431 (crash when parsing invalid address; invalid address
   returned by stream_socket_recvfrom(), stream_socket_getname()). (Wez)
 - Fixed bug #29409 (Segfault in PHP functions called from XSLT). (Rob)

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 2fc451aa9ed6798ddd2bb7fa3f00a0a05749e911..9e70a278cbafa83c15d2f81cbdf858b6aeecdb43 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -218,6 +218,8 @@ ARG_ENABLE("memory-limit", "Enable memory limit checking code", "no");
 
 AC_DEFINE('MEMORY_LIMIT', PHP_MEMORY_LIMIT == "yes" ? 1 : 0);
 
+AC_DEFINE('HAVE_USLEEP', 1);
+
 /* For snapshot builders, where can we find the additional
  * files that make up the snapshot template? */
 ARG_WITH("snapshot-template", "Path to snapshot builder template dir", "no");