diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-07 00:05:29 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-07 00:05:29 +0000 |
commit | 76bed096b245fc89715335232e4a3e3cf59b3034 (patch) | |
tree | d4e33b4f7527ad073556935d28cbdf986a7747f8 /editline | |
parent | 629878ed41f99b973c81b20d5663978f938bf0af (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@12196 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'editline')
-rw-r--r-- | editline/np/vis.c | 1 | ||||
-rw-r--r-- | editline/readline.c | 5 |
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" |