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 | |
| 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
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/asterisk.h | 7 | ||||
| -rw-r--r-- | main/stdtime/localtime.c | 10 |
3 files changed, 14 insertions, 5 deletions
@@ -181,6 +181,8 @@ endif ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) +ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h + ifeq ($(AST_DEVMODE),yes) ASTCFLAGS+=-Werror -Wunused endif diff --git a/include/asterisk.h b/include/asterisk.h index 3c91f3430..6579496f7 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -18,6 +18,13 @@ #ifndef _ASTERISK_H #define _ASTERISK_H +/* The include of 'autoconfig.h' is not necessary for any modules that + are part of the Asterisk source tree, because the top-level Makefile + will forcibly include that header in all compilations before all + other headers (even system headers). However, leaving this here will + help out-of-tree module builders, and doesn't cause any harm for the + in-tree modules. +*/ #include "asterisk/autoconfig.h" #include "asterisk/compat.h" 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"; |