- Fixed bug #53297 (gettimeofday implementation in php/win32/time.c can return

  1 million microsecs). (ped at 7gods dot org)
- Moved line out of order in NEWS.

diff --git a/win32/time.c b/win32/time.c
index 808ce8d5bd41326545d9df1e5dbfc6821d51ad74..a376fd61be0a0505982d1a60b9e869e2e05800ae 100644 (file)
--- a/win32/time.c
+++ b/win32/time.c
@@ -105,7 +105,7 @@ PHPAPI int gettimeofday(struct timeval *time_Info, struct timezone *timezone_Inf
                     dt = (double)timer/PW32G(freq);
                     time_Info->tv_sec = PW32G(starttime).tv_sec + (int)dt;
                     time_Info->tv_usec = PW32G(starttime).tv_usec + (int)((dt-(int)dt)*1000000);
-                    if (time_Info->tv_usec > 1000000) {
+                    if (time_Info->tv_usec >= 1000000) {
                         time_Info->tv_usec -= 1000000;
                         ++time_Info->tv_sec;
                     }