diff options
| author | Andrei Zmievski <andrei@php.net> | 2000-06-15 22:23:08 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2000-06-15 22:23:08 +0000 |
| commit | e48192fbb52d844b501d3017541f6349dbcfb672 (patch) | |
| tree | 69d98e04d24a54c297ebf91adc0b62ba55b54005 | |
| parent | 4c99114a25f887efa0cd63e06191b6a2e16684f9 (diff) | |
| download | php-git-e48192fbb52d844b501d3017541f6349dbcfb672.tar.gz | |
Use hardcoded 3600 seconds offset instead of altzone which may not be present
on all systems.
| -rw-r--r-- | ext/standard/datetime.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c index c67383c68d..1b837f79e5 100644 --- a/ext/standard/datetime.c +++ b/ext/standard/datetime.c @@ -53,7 +53,7 @@ char *day_short_names[] = }; #if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE) && !defined(HAVE_DECLARED_TIMEZONE) -extern time_t timezone, altzone; +extern time_t timezone; extern int daylight; #endif @@ -169,11 +169,10 @@ void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm) #else /* ** If correcting for daylight savings time, we set the adjustment to - ** the value of altzone variable. Otherwise, we need to overcorrect and - ** set the adjustment to the main timezone offset plus difference - ** between the main and alternate ones. + ** the value of timezone - 3600 seconds. Otherwise, we need to overcorrect and + ** set the adjustment to the main timezone + 3600 seconds. */ - gmadjust = -(is_dst ? altzone : timezone + (timezone - altzone)); + gmadjust = -(is_dst ? timezone - 3600 : timezone + 3600); #endif seconds += gmadjust; } @@ -411,7 +410,7 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm) #if HAVE_TM_GMTOFF sprintf(tmp_buff, "%ld", ta->tm_gmtoff); #else - sprintf(tmp_buff, "%ld", ta->tm_isdst ? altzone : timezone); + sprintf(tmp_buff, "%ld", ta->tm_isdst ? timezone - 3600 : timezone); #endif strcat(return_value->value.str.val, tmp_buff); break; |
