Merged revisions 103845 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 20 Feb 2008 18:28:00 +0000 (18:28 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 20 Feb 2008 18:28:00 +0000 (18:28 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@103846 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/stdtime/localtime.c

index 2d60bee..445f93a 100644 (file)
@@ -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 */