summaryrefslogtreecommitdiff
path: root/editline
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2006-03-06 23:04:56 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2006-03-06 23:04:56 +0000
commitd930fdbd614bbe90064fdbfa70386ed1be932293 (patch)
tree5e1f1c4e752a636c09783a17f540885a44a819f5 /editline
parentbbbd23e2bd4e76aeef19fac598f357cff65606f0 (diff)
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
Diffstat (limited to 'editline')
-rw-r--r--editline/np/vis.c1
-rw-r--r--editline/readline.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/editline/np/vis.c b/editline/np/vis.c
index 97406cdf8..83265f46e 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 2d398e12a..442118b38 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"