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 97406cdf8c8521fc25f98260e8b02b3859737a25..83265f46eab500086e9cca8e1459fce13e423041 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 2d398e12ab864e04e542d2a01223ab86c19ae04c..442118b3836c6bc571d789b82edbe3989921dc1a 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"