diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-20 18:28:00 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-20 18:28:00 +0000 |
| commit | 0095a6d4751cd5cdc32396ba57ccc9eef41bded1 (patch) | |
| tree | 3fb78bbf917dea11cb551e37fbdf47b4f9e3f490 /main/stdtime | |
| parent | b190a7fdbad7ae3123eacf2adce587eb94c51f9b (diff) | |
Merged revisions 103845 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r103845 | tilghman | 2008-02-20 11:53:00 -0600 (Wed, 20 Feb 2008) | 7 lines
Compat fix for Solaris
(closes issue #12022)
Reported by: asgaroth
Patches:
20080219__bug12022.diff.txt uploaded by Corydon76 (license 14)
Tested by: asgaroth
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@103846 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/stdtime')
| -rw-r--r-- | main/stdtime/localtime.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c index 2d60beefd..445f93a55 100644 --- a/main/stdtime/localtime.c +++ b/main/stdtime/localtime.c @@ -1128,7 +1128,9 @@ static struct ast_tm *localsub(const struct timeval *timep, const long offset, s */ result = timesub(&t, ttisp->tt_gmtoff, sp, tmp); tmp->tm_isdst = ttisp->tt_isdst; +#ifndef SOLARIS /* Solaris doesn't have this element */ tmp->tm_gmtoff = ttisp->tt_gmtoff; +#endif #ifdef TM_ZONE tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind]; #endif /* defined TM_ZONE */ |