diff options
| -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"; |