[asterisk-commits] murf: branch murf/bug7804 r41136 - in /team/murf/bug7804: pbx/ utils/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Fri Aug 25 14:58:21 2006
New Revision: 41136

URL: http://svn.digium.com/view/asterisk?rev=41136&view=rev
Log:
did a little cleanup.


Modified:
    team/murf/bug7804/pbx/pbx_ael.c
    team/murf/bug7804/utils/ael_main.c

Modified: team/murf/bug7804/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug7804/pbx/pbx_ael.c?rev=41136&r1=41135&r2=41136&view=diff
==============================================================================
--- team/murf/bug7804/pbx/pbx_ael.c (original)
+++ team/murf/bug7804/pbx/pbx_ael.c Fri Aug 25 14:58:21 2006
@@ -62,8 +62,6 @@
 
 static int errs, warns;
 static int notes;
-#ifndef STANDALONE_AEL
-#endif
 
 #ifndef AAL_ARGCHECK
 /* for the time being, short circuit all the AAL related structures
@@ -2151,8 +2149,6 @@
 		}
 	}
 }
-#ifndef STANDALONE_AEL
-#endif
 
 static void check_abstract_reference(pval *abstract_context)
 {
@@ -3895,6 +3891,12 @@
 
 #ifdef STANDALONE_AEL
 #define AST_MODULE "ael"
+int ael_external_load_module(void);
+int ael_external_load_module(void)
+{
+	pbx_load_module();
+	return 1;
+}
 #endif
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk Extension Language Compiler",
@@ -3902,15 +3904,6 @@
 		.unload = unload_module,
 		.reload = reload,
 	       );
-
-#ifdef STANDALONE_AEL
-int ael_external_load_module(void);
-int ael_external_load_module(void)
-{
-	pbx_load_module();
-	return 1;
-}
-#endif
 
 
 /* DESTROY the PVAL tree ============================================================================ */

Modified: team/murf/bug7804/utils/ael_main.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug7804/utils/ael_main.c?rev=41136&r1=41135&r2=41136&view=diff
==============================================================================
--- team/murf/bug7804/utils/ael_main.c (original)
+++ team/murf/bug7804/utils/ael_main.c Fri Aug 25 14:58:21 2006
@@ -474,7 +474,7 @@
 
 	FIRST_TIME = 1;
 	
-	ael_external_load_module(); /* pbx_load_module(); */ /*  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);