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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@12162 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/editline/np/vis.c b/editline/np/vis.c
index 97406cd..83265f4 100644 (file)
--- a/editline/np/vis.c
+++ b/editline/np/vis.c
@@ -68,6 +68,7 @@ __weak_alias(vis,_vis)
 #endif
 
 #ifdef SOLARIS
+#include <alloca.h>
 typedef unsigned int   u_int32_t;
 #endif
 

diff --git a/editline/readline.c b/editline/readline.c
index 2d398e1..442118b 100644 (file)
--- a/editline/readline.c
+++ b/editline/readline.c
@@ -51,6 +51,11 @@ __RCSID("$NetBSD: readline.c,v 1.21 2002/03/18 16:20:36 christos Exp $");
 #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"