diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2005-11-08 04:13:19 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2005-11-08 04:13:19 +0000 |
commit | 0941c32d38efef90cb3dafe463740b78329d1aa1 (patch) | |
tree | ac7748259e8c5731376a912004a76e59ab0b1c3d /stdtime/localtime.c | |
parent | ebf04fc5709739a1ee8beaf14dca62c29135b46a (diff) |
issue #5569 minus lock.h changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7024 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'stdtime/localtime.c')
-rwxr-xr-x | stdtime/localtime.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/stdtime/localtime.c b/stdtime/localtime.c index 67dc71d2c..db125d9e6 100755 --- a/stdtime/localtime.c +++ b/stdtime/localtime.c @@ -77,6 +77,12 @@ static const char elsieid[] = "@(#)localtime.c 7.57"; #define OPEN_MODE O_RDONLY #endif /* !defined O_BINARY */ +#ifdef SOLARIS +#undef TM_ZONE +#undef TM_GMTOFF +#endif + +#ifdef TM_ZONE #ifndef WILDABBR /*! \note * Someone might make incorrect use of a time zone abbreviation: @@ -101,6 +107,7 @@ static const char elsieid[] = "@(#)localtime.c 7.57"; #endif /* !defined WILDABBR */ static char wildabbr[] = "WILDABBR"; +#endif /* TM_ZONE */ /*! \brief FreeBSD defines 'zone' in 'struct tm' as non-const, so don't declare this string as const. */ @@ -130,12 +137,6 @@ struct lsinfo { #define MY_TZNAME_MAX 255 #endif /* !defined TZNAME_MAX */ -#ifdef SOLARIS -#undef TM_ZONE -#undef TM_GMTOFF -#endif - - struct state { char name[TZ_STRLEN_MAX + 1]; int leapcnt; |