pajoye Fri, 26 Nov 2010 18:25:13 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=305778
Log: - Fixed #53409, sleep() return NULL on Windows Bug: http://bugs.php.net/53409 (error getting bug information) Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/main/win95nt.h U php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in U php/php-src/branches/PHP_5_3/win32/winutil.c U php/php-src/trunk/main/win95nt.h U php/php-src/trunk/win32/build/config.w32.h.in Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-11-26 15:29:58 UTC (rev 305777) +++ php/php-src/branches/PHP_5_3/NEWS 2010-11-26 18:25:13 UTC (rev 305778) @@ -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) Modified: php/php-src/branches/PHP_5_3/main/win95nt.h =================================================================== --- php/php-src/branches/PHP_5_3/main/win95nt.h 2010-11-26 15:29:58 UTC (rev 305777) +++ php/php-src/branches/PHP_5_3/main/win95nt.h 2010-11-26 18:25:13 UTC (rev 305778) @@ -47,7 +47,7 @@ #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 Modified: php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in =================================================================== --- php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in 2010-11-26 15:29:58 UTC (rev 305777) +++ php/php-src/branches/PHP_5_3/win32/build/config.w32.h.in 2010-11-26 18:25:13 UTC (rev 305778) @@ -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 Modified: php/php-src/branches/PHP_5_3/win32/winutil.c =================================================================== --- php/php-src/branches/PHP_5_3/win32/winutil.c 2010-11-26 15:29:58 UTC (rev 305777) +++ php/php-src/branches/PHP_5_3/win32/winutil.c 2010-11-26 18:25:13 UTC (rev 305778) @@ -76,3 +76,4 @@ } } /* }}} */ + Modified: php/php-src/trunk/main/win95nt.h =================================================================== --- php/php-src/trunk/main/win95nt.h 2010-11-26 15:29:58 UTC (rev 305777) +++ php/php-src/trunk/main/win95nt.h 2010-11-26 18:25:13 UTC (rev 305778) @@ -47,7 +47,7 @@ #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 Modified: php/php-src/trunk/win32/build/config.w32.h.in =================================================================== --- php/php-src/trunk/win32/build/config.w32.h.in 2010-11-26 15:29:58 UTC (rev 305777) +++ php/php-src/trunk/win32/build/config.w32.h.in 2010-11-26 18:25:13 UTC (rev 305778) @@ -57,6 +57,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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
