diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-27 15:00:48 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-27 15:00:48 +0000 |
commit | 3be602e6c84bd15d5399be3352435b49e1329500 (patch) | |
tree | 8d6a23c06dea5cc67f34f27623fb8dd2514f02c5 /main | |
parent | 4af2c0074afcb295979d5d857477db3272b9c99c (diff) |
improve header inclusion process in a few small ways:
- it is no longer necessary to forcibly include asterisk/autoconfig.h; every module already includes asterisk.h as its first header (even before system headers), which serves the same purpose
- astmm.h is now included by asterisk.h when needed, instead of being forced by the Makefile; this means external modules will build properly against installed headers with MALLOC_DEBUG enabled
- simplify the usage of some of these headers in the AEL-related stuff in the utils directory
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@144924 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/ast_expr2.c | 2 | ||||
-rw-r--r-- | main/ast_expr2.fl | 2 | ||||
-rw-r--r-- | main/ast_expr2.y | 2 | ||||
-rw-r--r-- | main/ast_expr2f.c | 2 | ||||
-rw-r--r-- | main/stdtime/localtime.c | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/main/ast_expr2.c b/main/ast_expr2.c index 4acd56d54..9133e76ea 100644 --- a/main/ast_expr2.c +++ b/main/ast_expr2.c @@ -131,7 +131,7 @@ #include "asterisk.h" -#ifndef STANDALONE +#if !defined(STANDALONE_AEL) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #endif diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl index 68db50428..67dd3aa6a 100644 --- a/main/ast_expr2.fl +++ b/main/ast_expr2.fl @@ -24,7 +24,7 @@ #include "asterisk.h" -#ifndef STANDALONE +#if !defined(STANDALONE_AEL) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #endif diff --git a/main/ast_expr2.y b/main/ast_expr2.y index e47c2e721..b2faf374d 100644 --- a/main/ast_expr2.y +++ b/main/ast_expr2.y @@ -14,7 +14,7 @@ #include "asterisk.h" -#ifndef STANDALONE +#if !defined(STANDALONE_AEL) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #endif diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c index 9b8ef1532..f4b7dd0dc 100644 --- a/main/ast_expr2f.c +++ b/main/ast_expr2f.c @@ -504,7 +504,7 @@ static yyconst flex_int16_t yy_chk[127] = #include "asterisk.h" -#ifndef STANDALONE +#if !defined(STANDALONE_AEL) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #endif diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c index 1da0fe012..75968f787 100644 --- a/main/stdtime/localtime.c +++ b/main/stdtime/localtime.c @@ -44,6 +44,8 @@ /*LINTLIBRARY*/ +#include "asterisk.h" + #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -55,7 +57,6 @@ #include "private.h" #include "tzfile.h" -#include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") |