[asterisk-commits] trunk r12162 - in /trunk: ./ editline/np/vis.c editline/readline.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Mon Mar  6 17:04:56 2006
New Revision: 12162

URL: http://svn.digium.com/view/asterisk?rev=12162&view=rev
Log:
Merged revisions 12161 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r12161 | tilghman | 2006-03-06 17:03:54 -0600 (Mon, 06 Mar 2006) | 2 lines

Bug 6664 - More fixes for Solaris

........

Modified:
    trunk/   (props changed)
    trunk/editline/np/vis.c
    trunk/editline/readline.c

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

Modified: trunk/editline/np/vis.c
URL: http://svn.digium.com/view/asterisk/trunk/editline/np/vis.c?rev=12162&r1=12161&r2=12162&view=diff
==============================================================================
--- trunk/editline/np/vis.c (original)
+++ trunk/editline/np/vis.c Mon Mar  6 17:04:56 2006
@@ -68,6 +68,7 @@
 #endif
 
 #ifdef SOLARIS
+#include <alloca.h>
 typedef unsigned int	u_int32_t;
 #endif
 

Modified: trunk/editline/readline.c
URL: http://svn.digium.com/view/asterisk/trunk/editline/readline.c?rev=12162&r1=12161&r2=12162&view=diff
==============================================================================
--- trunk/editline/readline.c (original)
+++ trunk/editline/readline.c Mon Mar  6 17:04:56 2006
@@ -51,6 +51,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
+
+#ifdef SOLARIS
+#include <alloca.h>
+#endif
+
 #include "histedit.h"
 #include "readline/readline.h"
 #include "el.h"