[asterisk-commits] tilghman: trunk r85943 - in /trunk: ./ main/stdtime/localtime.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Oct 16 14:47:16 2007
New Revision: 85943

URL: http://svn.digium.com/view/asterisk?view=rev&rev=85943
Log:
Merged revisions 85921 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r85921 | tilghman | 2007-10-16 14:41:40 -0500 (Tue, 16 Oct 2007) | 4 lines

Also set up gmtoff (this is used in the %z gnu extension to strftime)
Reported and fixed by jcmoore
Closes issue #11002

........

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=85943&r1=85942&r2=85943
==============================================================================
--- trunk/main/stdtime/localtime.c (original)
+++ trunk/main/stdtime/localtime.c Tue Oct 16 14:47:16 2007
@@ -1131,6 +1131,7 @@
 	*/
 	result = timesub(&t, ttisp->tt_gmtoff, sp, tmp);
 	tmp->tm_isdst = ttisp->tt_isdst;
+	tmp->tm_gmtoff = ttisp->tt_gmtoff;
 #ifdef TM_ZONE
 	tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind];
 #endif /* defined TM_ZONE */