diff options
| -rw-r--r-- | main/ast_expr2.fl | 2 | ||||
| -rw-r--r-- | main/ast_expr2f.c | 2 | ||||
| -rw-r--r-- | pbx/ael/ael.flex | 2 | ||||
| -rw-r--r-- | 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 8f156e81f..5990a66ed 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 b0e69450f..6ba3244dd 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 41f24601c..cfdd5eb94 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 3a9ffc960..9a8747cab 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 <stdio.h> #include <string.h> @@ -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)); |