- MFH: Fixed bug #34052 (date('U') returns %ld not unix timestamp).

diff --git a/NEWS b/NEWS
index 4d1f273a193e0edd233350001fa6f5b2346e42a4..04df3b3130de79fa549da143882256b618557ea7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,7 @@ PHP                                                                        NEWS
   (Dmitry)
 - Fixed bug #34062 (Crash in catch block when many arguments are used).
   (Dmitry)
+- Fixed bug #34052 (date('U') returns %ld not unix timestamp). (Nuno)
 - Fixed bug #34045 (Buffer overflow with serialized object). (Dmitry)
 - Fixed bug #34001 (pdo_mysql truncates numberic fields at 4 chars). (Ilia)
 - Fixed bug #33999 (object remains object when cast to int). (Dmitry)

diff --git a/main/config.w32.h b/main/config.w32.h
index 6bfe3879a67f9c161a502741b6a56b8019dff232..724a8a1569ae256ecf973c4adee5653444638dd1 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -175,7 +175,7 @@
 #define SIZEOF_LONG 4
 /* MSVC.6/NET don't allow 'long long' or know 'intmax_t' */
 #define SIZEOF_LONG_LONG_INT 0
-#define SIZEOF_LONG_LONG 0
+#define SIZEOF_LONG_LONG 8 /* defined as __int64 */
 #define SIZEOF_INTMAX_T 0
 #define ssize_t SSIZE_T
 #ifdef _WIN64

diff --git a/main/snprintf.h b/main/snprintf.h
index 04437500412bc66c3a80ec21f1b49eaa0284de2d..371f41ad7665868b809121078245a549d28adcd7 100644 (file)
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -111,12 +111,12 @@ extern char * ap_php_ecvt(double arg, int ndigits, int *decpt, int *sign, char *
 extern char * ap_php_fcvt(double arg, int ndigits, int *decpt, int *sign, char *buf);
 extern char * ap_php_gcvt(double number, int ndigit, char *buf, boolean_e altform);
 
-#if SIZEOF_LONG_LONG_INT
+#if PHP_WIN32
+# define WIDE_INT              __int64
+#elif SIZEOF_LONG_LONG_INT
 # define WIDE_INT              long long int
 #elif SIZEOF_LONG_LONG
 # define WIDE_INT              long long
-#elif PHP_WIN32
-# define WIDE_INT              __int64
 #else
 # define WIDE_INT              long
 #endif