aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-27 00:05:05 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-27 00:05:05 +0000
commitd87a3b0d918ac6925cc5f0b32261b5cf35c802e0 (patch)
tree1ffb0510ced01fb20509c5af6278770492910c27 /utils
parent127c8f0535ef15c56d003c59f4a4cb8b21df100d (diff)
uncomment some functions in the flex code that were actually
used in the bison code - detected by making aelparse compile again. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22702 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile4
-rw-r--r--utils/ael_main.c12
2 files changed, 7 insertions, 9 deletions
diff --git a/utils/Makefile b/utils/Makefile
index d88beee83..9b838fc0e 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -14,7 +14,7 @@
#
# Don't use ast mm routines
#
-UTILS:=astman smsq stereorize streamplayer
+UTILS:=astman smsq stereorize streamplayer aelparse
ifeq (${OSARCH},SunOS)
SOL=../strcompat.o
@@ -70,7 +70,7 @@ aelparse : ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ../pbx/pbx_ael.o ael_main.
$(CC) $(CFLAGS) -g -o aelparse ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ael_main.o ../pbx/pbx_ael.o ../ast_expr2f.o ../ast_expr2.o
ael_main.o : ael_main.c ../include/asterisk/ael_structs.h
- $(CC) $(CFLAGS) -c -g -o ael_main.o ael_main.c
+ $(CC) $(CFLAGS) -include ../include/autoconfig.h -c -g -o ael_main.o ael_main.c
ael_main1.o : ael_main.c ../include/asterisk/ael_structs.h
$(CC) $(CFLAGS) -c -g -o ael_main1.o ael_main.c
diff --git a/utils/ael_main.c b/utils/ael_main.c
index ee6e815bd..018077b65 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -6,17 +6,15 @@
#include <ctype.h>
#if !defined(SOLARIS) && !defined(__CYGWIN__)
#include <err.h>
-#else
-#define quad_t int64_t
#endif
#include <errno.h>
#include <regex.h>
#include <limits.h>
-#include <asterisk/ast_expr.h>
-#include <asterisk/logger.h>
-#include <asterisk/module.h>
-#include <asterisk/channel.h>
-#include <asterisk/app.h>
+#include "asterisk/ast_expr.h"
+#include "asterisk/logger.h"
+#include "asterisk/module.h"
+#include "asterisk/channel.h"
+#include "asterisk/app.h"
#include "asterisk/ael_structs.h"
#define AST_CONFIG_MAX_PATH 255