aboutsummaryrefslogtreecommitdiffstats
path: root/main/stdtime
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-02-20 17:53:00 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-02-20 17:53:00 +0000
commit2a584b28fef6b09af2069c815ea6f93e37de8540 (patch)
treed2c686530c54766508e293443571619c803b38f5 /main/stdtime
parent9add8b52cc14cac39572c63246d9df622ec37093 (diff)
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/branches/1.4@103845 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/stdtime')
-rw-r--r--main/stdtime/localtime.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index 16274c8ec..1da0fe012 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -1133,7 +1133,9 @@ static struct tm *localsub(const time_t *timep, const long offset, struct tm *tm
*/
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 */