From: Antony Dovgal Date: Thu, 25 Jan 2007 14:38:45 +0000 (+0000) Subject: add missing ifdefs X-Git-Tag: RELEASE_1_2_3~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40ca697a671a63703c803e966f3efeed94456832;p=php add missing ifdefs --- diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c index 2483961365..1d2ff86e3f 100644 --- a/ext/date/lib/parse_tz.c +++ b/ext/date/lib/parse_tz.c @@ -21,7 +21,10 @@ #include "timelib.h" #include + +#ifdef HAVE_LOCALE_H #include +#endif #ifdef HAVE_STRING_H #include @@ -196,13 +199,15 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz) static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) { int left = 0, right = tzdb->index_size - 1; +#ifdef HAVE_SETLOCALE char *cur_locale = NULL, *tmp; - + tmp = setlocale(LC_CTYPE, NULL); if (tmp) { cur_locale = strdup(tmp); } setlocale(LC_CTYPE, "C"); +#endif do { int mid = ((unsigned)left + right) >> 1; @@ -214,15 +219,19 @@ static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const left = mid + 1; } else { /* (cmp == 0) */ (*tzf) = &(tzdb->data[tzdb->index[mid].pos + 20]); +#ifdef HAVE_SETLOCALE setlocale(LC_CTYPE, cur_locale); if (cur_locale) free(cur_locale); +#endif return 1; } } while (left <= right); +#ifdef HAVE_SETLOCALE setlocale(LC_CTYPE, cur_locale); if (cur_locale) free(cur_locale); +#endif return 0; }