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 /utils | |
| 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 'utils')
| -rw-r--r-- | utils/Makefile | 5 | ||||
| -rw-r--r-- | utils/ael_main.c | 25 |
2 files changed, 6 insertions, 24 deletions
diff --git a/utils/Makefile b/utils/Makefile index 07896260f..a31172b27 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -83,6 +83,8 @@ strcompat.c: ../main/strcompat.c ast_expr2.c: ../main/ast_expr2.c @cp $< $@ +ast_expr2.o: ASTCFLAGS+=-DSTANDALONE_AEL + ast_expr2f.c: ../main/ast_expr2f.c @cp $< $@ @@ -93,13 +95,14 @@ check_expr: check_expr.o ast_expr2.o ast_expr2f.o aelbison.c: ../pbx/ael/ael.tab.c @cp $< $@ aelbison.o: aelbison.c ../pbx/ael/ael.tab.h ../include/asterisk/ael_structs.h -aelbison.o: ASTCFLAGS+=-I../pbx +aelbison.o: ASTCFLAGS+=-I../pbx -DSTANDALONE_AEL pbx_ael.c: ../pbx/pbx_ael.c @cp $< $@ pbx_ael.o: ASTCFLAGS+=-DSTANDALONE_AEL ael_main.o: ael_main.c ../include/asterisk/ael_structs.h +ael_main.o: ASTCFLAGS+=-DSTANDALONE_AEL aelparse.c: ../pbx/ael/ael_lex.c @cp $< $@ diff --git a/utils/ael_main.c b/utils/ael_main.c index 6c8f3d390..85a2cc835 100644 --- a/utils/ael_main.c +++ b/utils/ael_main.c @@ -1,3 +1,5 @@ +#include "asterisk.h" + #include <sys/types.h> #include <stdio.h> #include <stdlib.h> @@ -78,10 +80,7 @@ char last_exten[18000]; char ast_config_AST_CONFIG_DIR[PATH_MAX]; char ast_config_AST_VAR_DIR[PATH_MAX]; -void ast_add_profile(void); void ast_cli_register_multiple(void); -void ast_register_file_version(void); -void ast_unregister_file_version(void); int ast_add_extension2(struct ast_context *con, int replace, const char *extension, int priority, const char *label, const char *callerid, const char *application, void *data, void (*datad)(void *), @@ -115,12 +114,6 @@ struct ast_app *pbx_findapp(const char *app) return (struct ast_app*)1; /* so as not to trigger an error */ } -void ast_add_profile(void) -{ - if (!no_comp) - printf("Executed ast_add_profile();\n"); -} - int ast_loader_register(int (*updater)(void)) { return 1; @@ -145,20 +138,6 @@ void ast_cli_register_multiple(void) printf("Executed ast_cli_register_multiple();\n"); } -void ast_register_file_version(void) -{ - /* if(!no_comp) - printf("Executed ast_register_file_version();\n"); */ - /* I'm erasing this, because I don't think anyone really ever needs to see it anyway */ -} - -void ast_unregister_file_version(void) -{ - /* if(!no_comp) - printf("Executed ast_unregister_file_version();\n"); */ - /* I'm erasing this, because I don't think anyone really ever needs to see it anyway */ - -} void pbx_substitute_variables_helper(struct ast_channel *c,const char *cp1,char *cp2,int count); void pbx_substitute_variables_helper(struct ast_channel *c,const char *cp1,char *cp2,int count) { |