[asterisk-commits] file: trunk r59201 - in /trunk: ./ pbx/ael/ael_lex.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Mar 26 10:20:17 2007
New Revision: 59201

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59201
Log:
Merged revisions 59200 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59200 | file | 2007-03-26 11:16:29 -0400 (Mon, 26 Mar 2007) | 2 lines

Have ast_copy_string magically appear in the aelparse binary! DONT_OPTIMIZE should now work once again.

........

Modified:
    trunk/   (props changed)
    trunk/pbx/ael/ael_lex.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/pbx/ael/ael_lex.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/ael/ael_lex.c?view=diff&rev=59201&r1=59200&r2=59201
==============================================================================
--- trunk/pbx/ael/ael_lex.c (original)
+++ trunk/pbx/ael/ael_lex.c Mon Mar 26 10:20:17 2007
@@ -1683,7 +1683,7 @@
 			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));