From: Kevin P. Fleming <kpfleming@digium.com>
Date: Sat, 16 Dec 2006 20:19:19 +0000 (+0000)
Subject: Merged revisions 48521 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3711
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=018a9c86e46d1dc474515c9a034427ec7da2217b;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/trunk@48522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index 9b85e4d84d..22a016c4f6 100644
--- a/Makefile
+++ b/Makefile
@@ -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 3c91f3430b..6579496f7a 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 5be8a14f2f..491b3df95e 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";