diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | main/config.w32.h | 2 | ||||
| -rw-r--r-- | main/snprintf.h | 6 |
3 files changed, 5 insertions, 4 deletions
@@ -29,5 +29,6 @@ PHP NEWS (Dmitry, Alex) - Fixed bug #34137 (assigning array element by reference causes binary mess). (Dmitry) +- Fixed bug #34052 (date('U') returns %ld not unix timestamp). (Nuno) - Fixed bug #33957 (gmdate('W')/date('W') sometimes returns wrong week number). (Derick) diff --git a/main/config.w32.h b/main/config.w32.h index 6bfe3879a6..724a8a1569 100644 --- 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 0443750041..371f41ad76 100644 --- 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 |