From 19e8d3fdcbe4927ad735833a255c692e103e9923 Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Mon, 26 Mar 2007 17:38:29 +0000 Subject: [PATCH] A fix for the flex input files, DONT_COMPILE, and STANDALONE_AEL git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@59206 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/ast_expr2.fl | 2 +- main/ast_expr2f.c | 2 +- pbx/ael/ael.flex | 2 +- pbx/ael/ael_lex.c | 6 +----- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl index 8f156e81fc..5990a66ed6 100644 --- a/main/ast_expr2.fl +++ b/main/ast_expr2.fl @@ -241,7 +241,7 @@ int ast_expr(char *expr, char *buf, int length) 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); diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c index b0e69450f4..6ba3244dd1 100644 --- a/main/ast_expr2f.c +++ b/main/ast_expr2f.c @@ -3122,7 +3122,7 @@ int ast_expr(char *expr, char *buf, int length) 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); diff --git a/pbx/ael/ael.flex b/pbx/ael/ael.flex index 41f24601c1..cfdd5eb948 100644 --- a/pbx/ael/ael.flex +++ b/pbx/ael/ael.flex @@ -411,7 +411,7 @@ includes { STORE_POS; return KW_INCLUDES;} 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)); diff --git a/pbx/ael/ael_lex.c b/pbx/ael/ael_lex.c index 3a9ffc9601..9a8747cab1 100644 --- a/pbx/ael/ael_lex.c +++ b/pbx/ael/ael_lex.c @@ -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 #include @@ -1687,7 +1683,7 @@ YY_RULE_SETUP 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));