diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-16 19:47:16 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-16 19:47:16 +0000 |
| commit | 78d84bd18669bdbbaf04ca8352f7a12a9054aa0d (patch) | |
| tree | 9c71d7e96faafe234ed56fd6866b9144587116d7 /main/stdtime | |
| parent | 81648dcc00a841198081546fc7e8aad7435cc911 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@85943 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/stdtime')
| -rw-r--r-- | main/stdtime/localtime.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c index af8fe391d..44607c921 100644 --- a/main/stdtime/localtime.c +++ b/main/stdtime/localtime.c @@ -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); 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 */ |