diff options
| author | sketch <sketch@NetBSD.org> | 2009-02-12 13:39:49 +0000 |
|---|---|---|
| committer | sketch <sketch@NetBSD.org> | 2009-02-12 13:39:49 +0000 |
| commit | fc16547f5e147a4ebbb9591a3c5af855acdf1c11 (patch) | |
| tree | eb90061411ca9753879e0426b54a0464ad8885c2 /lib/libedit | |
| parent | 1ff2d41bea670693773128f6ac5642e0da4e8601 (diff) | |
More fixes for existing portability stuff.
Diffstat (limited to 'lib/libedit')
| -rw-r--r-- | lib/libedit/makelist | 6 | ||||
| -rw-r--r-- | lib/libedit/readline.c | 9 | ||||
| -rw-r--r-- | lib/libedit/readline/readline.h | 4 | ||||
| -rw-r--r-- | lib/libedit/term.c | 7 |
4 files changed, 11 insertions, 15 deletions
diff --git a/lib/libedit/makelist b/lib/libedit/makelist index 405399d3343..06ae91b5446 100644 --- a/lib/libedit/makelist +++ b/lib/libedit/makelist @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: makelist,v 1.11 2005/10/22 16:45:03 christos Exp $ +# $NetBSD: makelist,v 1.12 2009/02/12 13:39:49 sketch Exp $ # # Copyright (c) 1992, 1993 # The Regents of the University of California. All rights reserved. @@ -83,7 +83,7 @@ case $FLAG in cat $FILES | $AWK ' BEGIN { printf("/* Automatically generated file, do not edit */\n"); - printf("#include \"sys.h\"\n#include \"el.h\"\n"); + printf("#include \"config.h\"\n#include \"el.h\"\n"); printf("private const struct el_bindings_t el_func_help[] = {\n"); low = "abcdefghijklmnopqrstuvwxyz_"; high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_"; @@ -164,7 +164,7 @@ case $FLAG in cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK ' BEGIN { printf("/* Automatically generated file, do not edit */\n"); - printf("#include \"sys.h\"\n#include \"el.h\"\n"); + printf("#include \"config.h\"\n#include \"el.h\"\n"); printf("private const el_func_t el_func[] = {"); maxlen = 80; needn = 1; diff --git a/lib/libedit/readline.c b/lib/libedit/readline.c index 6003605f85d..0eed33a37f6 100644 --- a/lib/libedit/readline.c +++ b/lib/libedit/readline.c @@ -1,4 +1,4 @@ -/* $NetBSD: readline.c,v 1.78 2009/02/05 19:15:26 christos Exp $ */ +/* $NetBSD: readline.c,v 1.79 2009/02/12 13:39:49 sketch Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: readline.c,v 1.78 2009/02/05 19:15:26 christos Exp $"); +__RCSID("$NetBSD: readline.c,v 1.79 2009/02/12 13:39:49 sketch Exp $"); #endif /* not lint && not SCCSID */ #include <sys/types.h> @@ -52,13 +52,10 @@ __RCSID("$NetBSD: readline.c,v 1.78 2009/02/05 19:15:26 christos Exp $"); #else #include "np/vis.h" #endif -#ifdef HAVE_ALLOCA_H -#include <alloca.h> -#endif +#include "readline/readline.h" #include "el.h" #include "fcns.h" /* for EL_NUM_FCNS */ #include "histedit.h" -#include "readline/readline.h" #include "filecomplete.h" void rl_prep_terminal(int); diff --git a/lib/libedit/readline/readline.h b/lib/libedit/readline/readline.h index c4806734bc5..53ae1dc39d6 100644 --- a/lib/libedit/readline/readline.h +++ b/lib/libedit/readline/readline.h @@ -1,4 +1,4 @@ -/* $NetBSD: readline.h,v 1.24 2009/02/05 19:15:26 christos Exp $ */ +/* $NetBSD: readline.h,v 1.25 2009/02/12 13:39:49 sketch Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ typedef KEYMAP_ENTRY *Keymap; #ifndef CTRL #include <sys/ioctl.h> -#if !defined(__sun__) && !defined(__hpux__) +#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) #include <sys/ttydefaults.h> #endif #ifndef CTRL diff --git a/lib/libedit/term.c b/lib/libedit/term.c index 3909d984b60..325a14fb090 100644 --- a/lib/libedit/term.c +++ b/lib/libedit/term.c @@ -1,4 +1,4 @@ -/* $NetBSD: term.c,v 1.48 2009/02/06 20:08:13 sketch Exp $ */ +/* $NetBSD: term.c,v 1.49 2009/02/12 13:39:49 sketch Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95"; #else -__RCSID("$NetBSD: term.c,v 1.48 2009/02/06 20:08:13 sketch Exp $"); +__RCSID("$NetBSD: term.c,v 1.49 2009/02/12 13:39:49 sketch Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -56,8 +56,7 @@ __RCSID("$NetBSD: term.c,v 1.48 2009/02/06 20:08:13 sketch Exp $"); #endif #ifdef HAVE_CURSES_H #include <curses.h> -#endif -#ifdef HAVE_NCURSES_H +#elif HAVE_NCURSES_H #include <ncurses.h> #endif /* Solaris's term.h does horrid things. */ |
