diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 14:37:23 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 14:37:23 +0000 |
commit | 177767109c3763492cd688a7f3300fd0eef513f7 (patch) | |
tree | f967649820c672710ffaa2b1e983f550a1b6cab6 /apps | |
parent | fc17e8a65890dec8831389a14ae49dd2cf8acbd1 (diff) |
Merged revisions 107462 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r107462 | kpfleming | 2008-03-11 09:37:03 -0500 (Tue, 11 Mar 2008) | 10 lines
Merged revisions 107461 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r107461 | kpfleming | 2008-03-11 09:33:45 -0500 (Tue, 11 Mar 2008) | 2 lines
stop checking for mktime() in the configure script... we don't use it, and the test is buggy under gcc 4.3
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@107463 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_sms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_sms.c b/apps/app_sms.c index 3c54d43f1..717f710e4 100644 --- a/apps/app_sms.c +++ b/apps/app_sms.c @@ -542,7 +542,7 @@ static time_t unpackdate(unsigned char *i) t.tm_min += 15 * ((i[6] & 0x7) * 10 + (i[6] >> 4)); else t.tm_min -= 15 * ((i[6] & 0x7) * 10 + (i[6] >> 4)); - return mktime(&t); + return ast_mktime(&t, NULL); } /*! \brief unpacks bytes (7 bit encoding) at i, len l septets, |