diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2007-06-14 22:09:20 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2007-06-14 22:09:20 +0000 |
| commit | 5fdba27ea22e1584759dd3c698922d8444c8eb2a (patch) | |
| tree | 9bccdddefcc0defe7b34185794b77a9439806dcd /channels/chan_iax2.c | |
| parent | 66ec973c5c3db2c5f7e68b4f6cd5895f23e6d10a (diff) | |
Merged revisions 69392 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r69392 | kpfleming | 2007-06-14 16:50:40 -0500 (Thu, 14 Jun 2007) | 2 lines
use ast_localtime() in every place localtime_r() was being used
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69405 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index c89ead79f..2092dfd64 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2874,9 +2874,10 @@ static unsigned int iax2_datetime(const char *tz) struct tm tm; unsigned int tmp; time(&t); - localtime_r(&t, &tm); if (!ast_strlen_zero(tz)) ast_localtime(&t, &tm, tz); + else + ast_localtime(&t, &tm, NULL); tmp = (tm.tm_sec >> 1) & 0x1f; /* 5 bits of seconds */ tmp |= (tm.tm_min & 0x3f) << 5; /* 6 bits of minutes */ tmp |= (tm.tm_hour & 0x1f) << 11; /* 5 bits of hours */ |