Index: pbx/ael/ael_lex.c
===================================================================
--- pbx/ael/ael_lex.c	(revision 162142)
+++ pbx/ael/ael_lex.c	(working copy)
@@ -55,6 +55,7 @@
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -85,8 +86,6 @@
 #define UINT32_MAX             (4294967295U)
 #endif
 
-#endif /* ! C99 */
-
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -945,7 +944,7 @@
 #define	STORE_POS
 #define	STORE_LOC
 #endif
-#line 948 "ael_lex.c"
+#line 947 "ael_lex.c"
 
 #define INITIAL 0
 #define paren 1
@@ -1097,7 +1096,7 @@
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1108,7 +1107,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1196,7 +1195,7 @@
 #line 206 "ael.flex"
 
 
-#line 1199 "ael_lex.c"
+#line 1198 "ael_lex.c"
 
     yylval = yylval_param;
 
@@ -2011,7 +2010,7 @@
 #line 635 "ael.flex"
 ECHO;
 	YY_BREAK
-#line 2014 "ael_lex.c"
+#line 2013 "ael_lex.c"
 
 	case YY_END_OF_BUFFER:
 		{