aboutsummaryrefslogtreecommitdiffstats
path: root/pbx
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-27 16:49:27 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-27 16:49:27 +0000
commit91ba8ce8c94796fed8bc3f92733721eb66582a3b (patch)
tree08fd22336f059b6ad0ce0c54f8d251c011c217da /pbx
parent3b0484f45b3b63714e8800d4ae48ac0f3b7baf4e (diff)
Merged revisions 144949-144951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r144949 | kpfleming | 2008-09-27 10:52:56 -0500 (Sat, 27 Sep 2008) | 17 lines 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 ........ ................ r144950 | kpfleming | 2008-09-27 11:10:33 -0500 (Sat, 27 Sep 2008) | 2 lines fix bugs caused by r144949 when MALLOC_DEBUG is defined ................ r144951 | kpfleming | 2008-09-27 11:17:43 -0500 (Sat, 27 Sep 2008) | 1 line remove incorrect comment ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@144993 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
-rw-r--r--pbx/pbx_ael.c4
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)