cvs: php4 /ext/standard datetime.c
| From: | Kai Schr�der | Date: | Sun, 09 Feb 2003 12:28:01 +0000 |
| Subject: | cvs: php4 /ext/standard datetime.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-18534@lists.php.net to get a copy of this message | ||
k.schroeder Sun Feb 9 07:28:01 2003 EDT
Modified files:
/php4/ext/standard datetime.c
Log:
MSVC's mktime() does not examine the existence of a daylight-saving-time zone
Index: php4/ext/standard/datetime.c
diff -u php4/ext/standard/datetime.c:1.102 php4/ext/standard/datetime.c:1.103
--- php4/ext/standard/datetime.c:1.102 Mon Feb 3 17:48:26 2003
+++ php4/ext/standard/datetime.c Sun Feb 9 07:28:01 2003
@@ -19,7 +19,7 @@
*/
-/* $Id: datetime.c,v 1.102 2003/02/03 22:48:26 iliaa Exp $ */
+/* $Id: datetime.c,v 1.103 2003/02/09 12:28:01 k.schroeder Exp $ */
#include "php.h"
@@ -123,7 +123,15 @@
*/
switch(arg_count) {
case 7: /* daylight saving time flag */
+#ifdef PHP_WIN32
+ if (daylight > 0) {
+ ta->tm_isdst = is_dst = Z_LVAL_PP(arguments[6]);
+ } else {
+ ta->tm_isdst = is_dst = 0;
+ }
+#else
ta->tm_isdst = is_dst = Z_LVAL_PP(arguments[6]);
+#endif
/* fall-through */
case 6: /* year */
/* special case: