Skip to content
Snippets Groups Projects
Commit bd27085c authored by Tilghman Lesher's avatar Tilghman Lesher
Browse files

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85943 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 1f21e037
No related branches found
No related tags found
No related merge requests found
...@@ -1131,6 +1131,7 @@ static struct ast_tm *localsub(const struct timeval *timep, const long offset, s ...@@ -1131,6 +1131,7 @@ static struct ast_tm *localsub(const struct timeval *timep, const long offset, s
*/ */
result = timesub(&t, ttisp->tt_gmtoff, sp, tmp); result = timesub(&t, ttisp->tt_gmtoff, sp, tmp);
tmp->tm_isdst = ttisp->tt_isdst; tmp->tm_isdst = ttisp->tt_isdst;
tmp->tm_gmtoff = ttisp->tt_gmtoff;
#ifdef TM_ZONE #ifdef TM_ZONE
tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind]; tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind];
#endif /* defined TM_ZONE */ #endif /* defined TM_ZONE */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment