From 3b195581db4b04c441318dc51fe10943f00bb98a Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Sat, 24 Apr 1999 20:48:12 +0000 Subject: [PATCH] bugfix port --- ext/standard/datetime.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c index d697928f3f..6cf2c37cb5 100644 --- a/ext/standard/datetime.c +++ b/ext/standard/datetime.c @@ -94,18 +94,16 @@ void _php3_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm) convert_to_long(arguments[i]); } t=time(NULL); - if (gm) { - tn = gmtime(&t); #if HAVE_TZSET - tzset(); -#if HAVE_TM_ZONE + tzset(); +#endif + tn = localtime(&t); + if (gm) { +#if HAVE_TM_GMTOFF gmadjust=(tn->tm_gmtoff)/3600; #else gmadjust=timezone/3600; #endif -#endif - } else { - tn = localtime(&t); } memcpy(&ta,tn,sizeof(struct tm)); ta.tm_isdst = -1; -- 2.40.0