Merged revisions 48521 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Sat, 16 Dec 2006 20:19:19 +0000 (20:19 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Sat, 16 Dec 2006 20:19:19 +0000 (20:19 +0000)
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

Makefile
include/asterisk.h
main/stdtime/localtime.c

index 9b85e4d..22a016c 100644 (file)
--- 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
index 3c91f34..6579496 100644 (file)
 #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"
index 5be8a14..491b3df 100644 (file)
 #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";