diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-27 16:36:39 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-27 16:36:39 +0000 |
| commit | 3d0c27970e149ee3d6091f0af18ba79ee10d51c3 (patch) | |
| tree | 2f1227fdee497a2c12e434f0f60dcddb0b00bf7f /main/ast_expr2f.c | |
| parent | 312c2ae1ebd7309cc68bb576a7471dac0edffa47 (diff) | |
Merged revisions 144949-144951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r144949 | kpfleming | 2008-09-27 10:52:56 -0500 (Sat, 27 Sep 2008) | 17 lines
Merged revisions 144924-144925 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r144924 | kpfleming | 2008-09-27 10:00:48 -0500 (Sat, 27 Sep 2008) | 6 lines
improve header inclusion process in a few small ways:
- it is no longer necessary to forcibly include asterisk/autoconfig.h; every module already includes asterisk.h as its first header (even before system headers), which serves the same purpose
- astmm.h is now included by asterisk.h when needed, instead of being forced by the Makefile; this means external modules will build properly against installed headers with MALLOC_DEBUG enabled
- simplify the usage of some of these headers in the AEL-related stuff in the utils directory
........
r144925 | kpfleming | 2008-09-27 10:13:30 -0500 (Sat, 27 Sep 2008) | 2 lines
fix some minor issues with rev 144924
........
................
r144950 | kpfleming | 2008-09-27 11:10:33 -0500 (Sat, 27 Sep 2008) | 2 lines
fix bugs caused by r144949 when MALLOC_DEBUG is defined
................
r144951 | kpfleming | 2008-09-27 11:17:43 -0500 (Sat, 27 Sep 2008) | 1 line
remove incorrect comment
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@144991 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/ast_expr2f.c')
| -rw-r--r-- | main/ast_expr2f.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/ast_expr2f.c b/main/ast_expr2f.c index 3d97d8b82..8046d6556 100644 --- a/main/ast_expr2f.c +++ b/main/ast_expr2f.c @@ -1,3 +1,5 @@ +#include "asterisk.h" + #line 2 "ast_expr2f.c" #line 4 "ast_expr2f.c" @@ -506,12 +508,10 @@ static yyconst flex_int16_t yy_chk[139] = * \brief Dialplan Expression Lexical Scanner */ -#include "asterisk.h" - #include <sys/types.h> #include <stdio.h> -#ifndef STANDALONE +#if !defined(STANDALONE) ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #else #ifndef __USE_ISOC99 @@ -2369,7 +2369,7 @@ int ast_expr(char *expr, char *buf, int length, struct ast_channel *chan) return_value = (res_length <= length) ? res_length : length; } else { if (io.val->u.s) -#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE_AEL) +#if defined(STANDALONE) || defined(LOW_MEMORY) || defined(STANDALONE) strncpy(buf, io.val->u.s, length - 1); #else /* !STANDALONE && !LOW_MEMORY */ ast_copy_string(buf, io.val->u.s, length); |