diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-16 20:19:19 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-16 20:19:19 +0000 |
commit | ca962eb0c070a467ced531839145c0bdff48cbae (patch) | |
tree | 63a0afa62473e6e7b996ec2764778397f3991133 /main/stdtime | |
parent | 91101a1b97abd029c03640350755d2f4d99959d8 (diff) |
Merged revisions 48521 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48521 | kpfleming | 2006-12-16 14:12:41 -0600 (Sat, 16 Dec 2006) | 2 lines
since we really, really have to have autoconfig.h included before all other headers (especially system headers), the Makefile will now force it to happen (this will fix build problems with files like ast_expr2f.c, where we can't control the inclusion order in the file itself)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48522 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/stdtime')
-rw-r--r-- | main/stdtime/localtime.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c index 5be8a14f2..491b3df95 100644 --- a/main/stdtime/localtime.c +++ b/main/stdtime/localtime.c @@ -43,10 +43,6 @@ #define TZ_STRLEN_MAX 255 /* #define DEBUG */ -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - /*LINTLIBRARY*/ #include <sys/types.h> @@ -58,10 +54,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "private.h" #include "tzfile.h" + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/lock.h" #include "asterisk/localtime.h" - #ifndef lint #ifndef NOID static const char elsieid[] = "@(#)localtime.c 7.57"; |