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 /pbx | |
| 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 'pbx')
| -rw-r--r-- | pbx/ael/ael.flex | 2 | ||||
| -rw-r--r-- | pbx/ael/ael.tab.c | 2 | ||||
| -rw-r--r-- | pbx/ael/ael.y | 2 | ||||
| -rw-r--r-- | pbx/ael/ael_lex.c | 2 | ||||
| -rw-r--r-- | pbx/pbx_ael.c | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/pbx/ael/ael.flex b/pbx/ael/ael.flex index 2bf00695b..6eb305843 100644 --- a/pbx/ael/ael.flex +++ b/pbx/ael/ael.flex @@ -60,7 +60,9 @@ %option bison-locations %{ +#if !defined(STANDALONE_AEL) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#endif #include <sys/types.h> #include <sys/stat.h> diff --git a/pbx/ael/ael.tab.c b/pbx/ael/ael.tab.c index 78986ec09..df2f4e265 100644 --- a/pbx/ael/ael.tab.c +++ b/pbx/ael/ael.tab.c @@ -179,7 +179,9 @@ #include "asterisk.h" +#if !defined(STANDALONE_AEL) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#endif #include <stdio.h> #include <stdlib.h> diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y index 3ddcee8f0..c5668487b 100644 --- a/pbx/ael/ael.y +++ b/pbx/ael/ael.y @@ -24,7 +24,9 @@ #include "asterisk.h" +#if !defined(STANDALONE_AEL) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#endif #include <stdio.h> #include <stdlib.h> diff --git a/pbx/ael/ael_lex.c b/pbx/ael/ael_lex.c index 537ee0ea8..8729649e1 100644 --- a/pbx/ael/ael_lex.c +++ b/pbx/ael/ael_lex.c @@ -817,7 +817,9 @@ static yyconst flex_int16_t yy_chk[1073] = * bison-locations is probably not needed. */ #line 63 "ael.flex" +#if !defined(STANDALONE_AEL) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#endif #include <sys/types.h> #include <sys/stat.h> diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index 71282d71b..d68c7c547 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -24,7 +24,9 @@ #include "asterisk.h" +#if !defined(STANDALONE_AEL) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#endif #include <sys/types.h> #include <stdlib.h> |