summaryrefslogtreecommitdiff
path: root/main/stdtime
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2007-06-14 22:09:20 +0000
committerKevin P. Fleming <kpfleming@digium.com>2007-06-14 22:09:20 +0000
commit5fdba27ea22e1584759dd3c698922d8444c8eb2a (patch)
tree9bccdddefcc0defe7b34185794b77a9439806dcd /main/stdtime
parent66ec973c5c3db2c5f7e68b4f6cd5895f23e6d10a (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 'main/stdtime')
-rw-r--r--main/stdtime/localtime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index e54f2affd..18cd3d7d8 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -1217,7 +1217,7 @@ const time_t * const timep;
char *buf;
{
struct tm tm;
- return asctime_r(localtime_r(timep, &tm), buf);
+ return asctime_r(ast_localtime(timep, &tm, NULL), buf);
}
/*