diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-25 20:43:51 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-25 20:43:51 +0000 |
commit | 5c397dd961a90d25cbc91f99895db258769b296b (patch) | |
tree | 25fd0c92bb7447c5a6951056b0d2ae97b6c89782 /utils | |
parent | 4d8047ba7c7500cd0873c0cfa42882956bf82416 (diff) |
Changes to fix all problems reported in 7804 are included here.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@41150 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils')
-rw-r--r-- | utils/Makefile | 8 | ||||
-rw-r--r-- | utils/ael_main.c | 21 |
2 files changed, 24 insertions, 5 deletions
diff --git a/utils/Makefile b/utils/Makefile index c17364005..d59bfec65 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -68,12 +68,12 @@ stereorize: LIBS+=-lm $(eval $(call ast_make_o_c,ast_expr2.o,../main/ast_expr2.c)) $(eval $(call ast_make_o_c,ast_expr2f.o,../main/ast_expr2f.c)) -ast_expr2f.o: CFLAGS+=-DSTANDALONE +ast_expr2f.o: CFLAGS+=-DSTANDALONE_AEL $(eval $(call ast_make_final,check_expr,check_expr.c ast_expr2.o ast_expr2f.o)) $(eval $(call ast_make_o_c,aelflex.o,../pbx/ael/ael_lex.c ../include/asterisk/ael_structs.h ../pbx/ael/ael.tab.h)) -aelflex.o: CFLAGS+=-I../pbx -DSTANDALONE +aelflex.o: CFLAGS+=-I../pbx -DSTANDALONE_AEL $(eval $(call ast_make_o_c,aelbison.o,../pbx/ael/ael.tab.c ../pbx/ael/ael.tab.h ../include/asterisk/ael_structs.h)) aelbison.o: CFLAGS+=-I../pbx @@ -86,8 +86,8 @@ $(eval $(call ast_make_final,aelparse,aelflex.o aelbison.o pbx_ael.o ael_main.o $(eval $(call ast_make_o_c,ael_main.o,ael_main.c ../include/asterisk/ael_structs.h)) testexpr2s: ../main/ast_expr2f.c ../main/ast_expr2.c ../main/ast_expr2.h - $(CC) -g -c -I../include -DSTANDALONE ../main/ast_expr2f.c -o ast_expr2f.o - $(CC) -g -c -I../include -DSTANDALONE ../main/ast_expr2.c -o ast_expr2.o + $(CC) -g -c -I../include -DSTANDALONE_AEL ../main/ast_expr2f.c -o ast_expr2f.o + $(CC) -g -c -I../include -DSTANDALONE_AEL ../main/ast_expr2.c -o ast_expr2.o $(CC) -g -o testexpr2s ast_expr2f.o ast_expr2.o rm ast_expr2.o ast_expr2f.o ./testexpr2s expr2.testinput diff --git a/utils/ael_main.c b/utils/ael_main.c index e89a4b456..c9f3d9f3c 100644 --- a/utils/ael_main.c +++ b/utils/ael_main.c @@ -119,6 +119,24 @@ void ast_add_profile(void) printf("Executed ast_add_profile();\n"); } +int ast_loader_register(int (*updater)(void)) +{ + return 1; +} + +int ast_loader_unregister(int (*updater)(void)) +{ + return 1; +} +void ast_module_register(const struct ast_module_info *x) +{ +} + +void ast_module_unregister(const struct ast_module_info *x) +{ +} + + void ast_cli_register_multiple(void) { if(!no_comp) @@ -406,6 +424,7 @@ void filter_newlines(char *str) extern struct module_symbols mod_data; +extern ael_external_load_module(void); int main(int argc, char **argv) { @@ -455,7 +474,7 @@ int main(int argc, char **argv) FIRST_TIME = 1; - ast_module_info->load(); + ael_external_load_module(); ast_log(4, "ael2_parse", __LINE__, "main", "%d contexts, %d extensions, %d priorities\n", conts, extens, priors); |