diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-09-27 15:52:56 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-09-27 15:52:56 +0000 |
| commit | 629861a70566cc36ce9d81adb077878545271279 (patch) | |
| tree | 74b2e6933215849b3a07e112fb2b9f893431888f /pbx/pbx_ael.c | |
| parent | f1b673eef0471fa17b4149aec92a3a10e76ff5b2 (diff) | |
Merged revisions 144924-144925 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r144924 | kpfleming | 2008-09-27 10:00:48 -0500 (Sat, 27 Sep 2008) | 6 lines
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
........
r144925 | kpfleming | 2008-09-27 10:13:30 -0500 (Sat, 27 Sep 2008) | 2 lines
fix some minor issues with rev 144924
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@144949 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/pbx_ael.c')
| -rw-r--r-- | pbx/pbx_ael.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index 22ec24105..81801f1c9 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -28,7 +28,9 @@ #include "asterisk.h" +#if !defined(STANDALONE) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#endif #include <ctype.h> #include <regex.h> @@ -262,7 +264,7 @@ static int reload(void) return pbx_load_module(); } -#ifdef STANDALONE_AEL +#ifdef STANDALONE #define AST_MODULE "ael" int ael_external_load_module(void); int ael_external_load_module(void) |