Convert the value of tz_minuteswest inside struct timezone on Windows to

minutes from seconds.

diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
index 5d6da7c2fa69fc6ce6d8039d6060026d1034fe02..17a4a98328577da063a39e3799ac24d8be3af5e0 100644 (file)
--- a/ext/standard/microtime.c
+++ b/ext/standard/microtime.c
@@ -43,6 +43,7 @@
 
 #define NUL  '\0'
 #define MICRO_IN_SEC 1000000.00
+#define SEC_IN_MIN 60
 
 /* {{{ proto string microtime(void)
    Returns a string containing the current time in seconds and microseconds */
@@ -81,7 +82,11 @@ PHP_FUNCTION(gettimeofday)
                array_init(return_value);
                add_assoc_long(return_value, "sec", tp.tv_sec);
                add_assoc_long(return_value, "usec", tp.tv_usec);
+#ifdef PHP_WIN32
+               add_assoc_long(return_value, "minuteswest", tz.tz_minuteswest/SEC_IN_MIN);
+#else
                add_assoc_long(return_value, "minuteswest", tz.tz_minuteswest);
+#endif                 
                add_assoc_long(return_value, "dsttime", tz.tz_dsttime);
                return;
        } else