diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-26 17:38:29 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-26 17:38:29 +0000 |
| commit | 447253fbc7b4ab5376f622c323ab2046248563c7 (patch) | |
| tree | 17c46258e9fb10bc2661fbeed28b6d810ed08a20 /pbx | |
| parent | 3c6b98aa3dc1e2c146c030c4deefa9fac3ad1ceb (diff) | |
A fix for the flex input files, DONT_COMPILE, and STANDALONE_AEL
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@59206 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/ael/ael.flex | 2 | ||||
| -rw-r--r-- | pbx/ael/ael_lex.c | 6 |
2 files changed, 2 insertions, 6 deletions
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)); |