]> granicus.if.org Git - php/commitdiff
Don't assume that tzname exists, if tm_zone does not exist.
authorSascha Schumann <sas@php.net>
Sat, 24 Feb 2001 21:18:28 +0000 (21:18 +0000)
committerSascha Schumann <sas@php.net>
Sat, 24 Feb 2001 21:18:28 +0000 (21:18 +0000)
PR: #9380

ext/standard/datetime.c

index b022e57fce2d162968eb51da131c6ba83179855b..1207a578cf02bcdb6ecd76e76a4da8eff40ab35d 100644 (file)
@@ -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;