diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2008-09-27 15:52:56 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-09-27 15:52:56 +0000 |
commit | 629861a70566cc36ce9d81adb077878545271279 (patch) | |
tree | 74b2e6933215849b3a07e112fb2b9f893431888f /main/ast_expr2.fl | |
parent | f1b673eef0471fa17b4149aec92a3a10e76ff5b2 (diff) |
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
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@144949 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/ast_expr2.fl')
-rw-r--r-- | main/ast_expr2.fl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl index f446606f0..6fca88293 100644 --- a/main/ast_expr2.fl +++ b/main/ast_expr2.fl @@ -22,12 +22,10 @@ * \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 @@ -276,7 +274,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); |