- Fixed #53409, sleep() return NULL on Windows

diff --git a/NEWS b/NEWS
index 9ea0f828f83e6b69fd2d9c743277dc2e2c4da0f6..417508e7a4792250810649f9163f9d1f71f5df76 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,8 @@
     decimal places). (Ilia)
   . Fixed bug #46587 (mt_rand() does not check that max is greater than min).
     (Ilia)  
-      
+  . Fixed #53409 (sleep() returns NULL on Windows). (Pierre)
+
 - Hash extension:
   . Fixed bug #51003 (unaligned memory access in ext/hash/hash_tiger.c).
     (Mike, Ilia)

diff --git a/main/win95nt.h b/main/win95nt.h
index cf46056cd7d14c039ed07dd0df43d7d7a0415e5a..a99b782f16940af513be7057fca66532772fca72 100644 (file)
--- a/main/win95nt.h
+++ b/main/win95nt.h
@@ -47,7 +47,7 @@ typedef char * caddr_t;
 #define mkdir(a, b)    _mkdir(a)
 #define rmdir(a)       _rmdir(a)
 #define getpid         _getpid
-#define php_sleep(t)   Sleep(t*1000)
+#define php_sleep(t)   SleepEx(t*1000, TRUE)
 #ifndef getcwd
 # define getcwd(a, b)          _getcwd(a, b)
 #endif

diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 119e1c111200ddcf2ec10157df87a8fab7f9838f..45ffc9d326b8e8df6d330b9abe115aaf0262d876 100644 (file)
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -58,6 +58,7 @@
 /* its in win32/time.c */
 #define HAVE_USLEEP 1
 #define HAVE_NANOSLEEP 1
+#define PHP_SLEEP_NON_VOID 1
 
 #define HAVE_GETHOSTNAME 1
 #define HAVE_GETCWD 1

diff --git a/win32/winutil.c b/win32/winutil.c
index b310ad9614e3cdcce9e73fdba0915b92fdf6cdd5..a1d7d56655af17f5f87aa6e6efef6ad9c434c06e 100644 (file)
--- a/win32/winutil.c
+++ b/win32/winutil.c
@@ -76,3 +76,4 @@ PHPAPI int php_win32_get_random_bytes(unsigned char *buf, size_t size) {  /* {{{
        }
 }
 /* }}} */
+