From: Automerge script <automerge@asterisk.org>
Date: Tue, 7 Mar 2006 00:05:29 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.6-netsec~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db6920d6281b4efc529512b8b1c339d3ab563b91;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@12196 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/editline/np/vis.c b/editline/np/vis.c
index 97406cdf8c..83265f46ea 100644
--- 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 2d398e12ab..442118b383 100644
--- 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"