diff options
| author | Mark Spencer <markster@digium.com> | 2004-12-14 23:36:30 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-12-14 23:36:30 +0000 |
| commit | 9d40b8ee8045660d58281553e34b7f45406951c0 (patch) | |
| tree | 48694f38698e4ead3840305333816193c7fcd8a0 /stdtime/localtime.c | |
| parent | 0f205bb07903a70272e8ae2403afe20ceb06cedc (diff) | |
Merge slimey's Solaris compatibility (with small mods) (bug #2740)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'stdtime/localtime.c')
| -rwxr-xr-x | stdtime/localtime.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/stdtime/localtime.c b/stdtime/localtime.c index 1f6309e3f..2f9d412fd 100755 --- a/stdtime/localtime.c +++ b/stdtime/localtime.c @@ -113,6 +113,12 @@ struct lsinfo { /* leap second information */ #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; @@ -1208,7 +1214,11 @@ const time_t * const timep; char *buf; { struct tm tm; +#ifdef SOLARIS + return asctime_r(localtime_r(timep, &tm), buf, 256); +#else return asctime_r(localtime_r(timep, &tm), buf); +#endif } /* |