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 /include/asterisk/utils.h | |
| 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 'include/asterisk/utils.h')
| -rw-r--r-- | include/asterisk/utils.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 4b523da98..779db5ea0 100644 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -33,11 +33,13 @@ #include <netdb.h> #include <limits.h> #include <string.h> +#include <time.h> /* we want to override localtime_r */ #include "asterisk/lock.h" #include "asterisk/time.h" #include "asterisk/logger.h" #include "asterisk/compiler.h" +#include "asterisk/localtime.h" /*! \note \verbatim @@ -255,6 +257,11 @@ const char *ast_inet_ntoa(struct in_addr ia); #endif #define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__ +#ifdef localtime_r +#undef localtime_r +#endif +#define localtime_r __dont_use_localtime_r_use_ast_localtime_instead__ + int ast_utils_init(void); int ast_wait_for_input(int fd, int ms); |