summaryrefslogtreecommitdiff
path: root/ext/standard/datetime.c
diff options
context:
space:
mode:
authorKai Schroeder <k.schroeder@php.net>2003-02-09 12:28:01 +0000
committerKai Schroeder <k.schroeder@php.net>2003-02-09 12:28:01 +0000
commit1e2449846103c0352dc2213e28c1f4beb923ea60 (patch)
treee0f436f3b6e44383c7343e8eee9326cad64b719e /ext/standard/datetime.c
parent745bec1c480b758d6130358d01a7bdf82a07f8a2 (diff)
downloadphp-git-1e2449846103c0352dc2213e28c1f4beb923ea60.tar.gz
MSVC's mktime() does not examine the existence of a daylight-saving-time zone
Diffstat (limited to 'ext/standard/datetime.c')
-rw-r--r--ext/standard/datetime.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index 13b92322f0..39a7e4c96b 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -123,7 +123,15 @@ void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm)
*/
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: