summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2001-02-24 21:18:28 +0000
committerSascha Schumann <sas@php.net>2001-02-24 21:18:28 +0000
commitb37b5f93aaa5947d7cb396e021289d42a2e46beb (patch)
tree972ac4e748b44a8568ded20edbd4b5b5e0a954fb
parent0bed99453157067727e374786fecf6be75b4c986 (diff)
downloadphp-git-b37b5f93aaa5947d7cb396e021289d42a2e46beb.tar.gz
Don't assume that tzname exists, if tm_zone does not exist.
PR: #9380
-rw-r--r--ext/standard/datetime.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index b022e57fce..1207a578cf 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -260,7 +260,7 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
case 'T': /* timezone name */
#if HAVE_TM_ZONE
size += strlen(ta->tm_zone);
-#else
+#elif HAVE_TZNAME
size += strlen(tzname[0]);
#endif
break;
@@ -452,7 +452,7 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
case 'T': /* timezone name */
#if HAVE_TM_ZONE
strcat(return_value->value.str.val, ta->tm_zone);
-#else
+#elif HAVE_TZNAME
strcat(return_value->value.str.val, tzname[0]);
#endif
break;