derick Thu Sep 15 15:10:14 2005 EDT
Modified files:
/php-src NEWS
/php-src/main config.w32.h snprintf.h
Log:
- Fixed bug #34052 (date('U') returns %ld not unix timestamp).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2060&r2=1.2061&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2060 php-src/NEWS:1.2061
--- php-src/NEWS:1.2060 Mon Sep 12 07:48:26 2005
+++ php-src/NEWS Thu Sep 15 15:10:10 2005
@@ -29,5 +29,6 @@
(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)
http://cvs.php.net/diff.php/php-src/main/config.w32.h?r1=1.85&r2=1.86&ty=u
Index: php-src/main/config.w32.h
diff -u php-src/main/config.w32.h:1.85 php-src/main/config.w32.h:1.86
--- php-src/main/config.w32.h:1.85 Tue Feb 10 13:50:10 2004
+++ php-src/main/config.w32.h Thu Sep 15 15:10:13 2005
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
- $Id: config.w32.h,v 1.85 2004/02/10 18:50:10 zeev Exp $
+ $Id: config.w32.h,v 1.86 2005/09/15 19:10:13 derick Exp $
*/
/* Default PHP / PEAR directories */
@@ -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
http://cvs.php.net/diff.php/php-src/main/snprintf.h?r1=1.32&r2=1.33&ty=u
Index: php-src/main/snprintf.h
diff -u php-src/main/snprintf.h:1.32 php-src/main/snprintf.h:1.33
--- php-src/main/snprintf.h:1.32 Wed Aug 3 10:08:39 2005
+++ php-src/main/snprintf.h Thu Sep 15 15:10:13 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snprintf.h,v 1.32 2005/08/03 14:08:39 sniper Exp $ */
+/* $Id: snprintf.h,v 1.33 2005/09/15 19:10:13 derick Exp $ */
/*
@@ -111,12 +111,12 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
