[asterisk-commits] murf: branch 1.4 r59206 - in /branches/1.4: main/ pbx/ael/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Mon Mar 26 12:38:29 2007
New Revision: 59206

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59206
Log:
A fix for the flex input files, DONT_COMPILE, and STANDALONE_AEL

Modified:
    branches/1.4/main/ast_expr2.fl
    branches/1.4/main/ast_expr2f.c
    branches/1.4/pbx/ael/ael.flex
    branches/1.4/pbx/ael/ael_lex.c

Modified: branches/1.4/main/ast_expr2.fl
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/ast_expr2.fl?view=diff&rev=59206&r1=59205&r2=59206
==============================================================================
--- branches/1.4/main/ast_expr2.fl (original)
+++ branches/1.4/main/ast_expr2.fl Mon Mar 26 12:38:29 2007
@@ -241,7 +241,7 @@
 			res_length = snprintf(buf, length, "%ld", (long int) io.val->u.i);
 			return_value = (res_length <= length) ? res_length : length;
 		} else {
-#if defined(STANDALONE) || defined(LOW_MEMORY)
+#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
 			strncpy(buf, io.val->u.s, length - 1);
 #else /* !STANDALONE && !LOW_MEMORY */
 			ast_copy_string(buf, io.val->u.s, length);

Modified: branches/1.4/main/ast_expr2f.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/ast_expr2f.c?view=diff&rev=59206&r1=59205&r2=59206
==============================================================================
--- branches/1.4/main/ast_expr2f.c (original)
+++ branches/1.4/main/ast_expr2f.c Mon Mar 26 12:38:29 2007
@@ -3122,7 +3122,7 @@
 			res_length = snprintf(buf, length, "%ld", (long int) io.val->u.i);
 			return_value = (res_length <= length) ? res_length : length;
 		} else {
-#if defined(STANDALONE) || defined(LOW_MEMORY)
+#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
 			strncpy(buf, io.val->u.s, length - 1);
 #else /* !STANDALONE && !LOW_MEMORY */
 			ast_copy_string(buf, io.val->u.s, length);

Modified: branches/1.4/pbx/ael/ael.flex
URL: http://svn.digium.com/view/asterisk/branches/1.4/pbx/ael/ael.flex?view=diff&rev=59206&r1=59205&r2=59206
==============================================================================
--- branches/1.4/pbx/ael/ael.flex (original)
+++ branches/1.4/pbx/ael/ael.flex Mon Mar 26 12:38:29 2007
@@ -411,7 +411,7 @@
 			if (*(p1+1) != '/')
 				snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ast_config_AST_CONFIG_DIR, p1 + 1);
 			else
-#if defined(STANDALONE) || defined(LOW_MEMORY)
+#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
 				strncpy(fnamebuf, p1 + 1, sizeof(fnamebuf) - 1);
 #else
 				ast_copy_string(fnamebuf, p1 + 1, sizeof(fnamebuf));

Modified: branches/1.4/pbx/ael/ael_lex.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/pbx/ael/ael_lex.c?view=diff&rev=59206&r1=59205&r2=59206
==============================================================================
--- branches/1.4/pbx/ael/ael_lex.c (original)
+++ branches/1.4/pbx/ael/ael_lex.c Mon Mar 26 12:38:29 2007
@@ -17,10 +17,6 @@
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
 #include "asterisk.h"
-#ifdef STANDALONE_AEL
-#define AST_API_MODULE
-#include "asterisk/strings.h"
-#endif
 /* begin standard C headers. */
 #include <stdio.h>
 #include <string.h>
@@ -1687,7 +1683,7 @@
 			if (*(p1+1) != '/')
 				snprintf(fnamebuf, sizeof(fnamebuf), "%s/%s", ast_config_AST_CONFIG_DIR, p1 + 1);
 			else
-#if defined(STANDALONE) || defined(LOW_MEMORY)
+#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL)
 				strncpy(fnamebuf, p1 + 1, sizeof(fnamebuf) - 1);
 #else
 				ast_copy_string(fnamebuf, p1 + 1, sizeof(fnamebuf));