[svn-commits] tilghman: trunk r103846 - in /trunk: ./ main/stdtime/localtime.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Feb 20 12:28:00 2008
New Revision: 103846

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103846
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/main/stdtime/localtime.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/stdtime/localtime.c
URL: http://svn.digium.com/view/asterisk/trunk/main/stdtime/localtime.c?view=diff&rev=103846&r1=103845&r2=103846
==============================================================================
--- trunk/main/stdtime/localtime.c (original)
+++ trunk/main/stdtime/localtime.c Wed Feb 20 12:28:00 2008
@@ -1128,7 +1128,9 @@
 	*/
 	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 */