diff options
| author | christos <christos@NetBSD.org> | 2016-02-16 14:06:05 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2016-02-16 14:06:05 +0000 |
| commit | be424bf8b740bd3443f2cf214257bfde4d6360c8 (patch) | |
| tree | f000b712722487602832028e1696902783938109 /lib/libedit | |
| parent | 5755da731bda2d7941f2684d17132c645c0c2646 (diff) | |
cleanup inclusion of histedit.h (Ingo Schwarze)
Diffstat (limited to 'lib/libedit')
| -rw-r--r-- | lib/libedit/chared.c | 6 | ||||
| -rw-r--r-- | lib/libedit/chared.h | 4 | ||||
| -rw-r--r-- | lib/libedit/chartype.c | 6 | ||||
| -rw-r--r-- | lib/libedit/common.c | 5 | ||||
| -rw-r--r-- | lib/libedit/el.c | 5 | ||||
| -rw-r--r-- | lib/libedit/el.h | 3 | ||||
| -rw-r--r-- | lib/libedit/emacs.c | 5 | ||||
| -rw-r--r-- | lib/libedit/filecomplete.c | 6 | ||||
| -rw-r--r-- | lib/libedit/hist.c | 6 | ||||
| -rw-r--r-- | lib/libedit/hist.h | 4 | ||||
| -rw-r--r-- | lib/libedit/keymacro.c | 5 | ||||
| -rw-r--r-- | lib/libedit/makelist | 10 | ||||
| -rw-r--r-- | lib/libedit/map.c | 6 | ||||
| -rw-r--r-- | lib/libedit/parse.c | 8 | ||||
| -rw-r--r-- | lib/libedit/prompt.c | 6 | ||||
| -rw-r--r-- | lib/libedit/prompt.h | 4 | ||||
| -rw-r--r-- | lib/libedit/read.c | 6 | ||||
| -rw-r--r-- | lib/libedit/readline.c | 6 | ||||
| -rw-r--r-- | lib/libedit/refresh.c | 5 | ||||
| -rw-r--r-- | lib/libedit/refresh.h | 4 | ||||
| -rw-r--r-- | lib/libedit/search.c | 6 | ||||
| -rw-r--r-- | lib/libedit/search.h | 4 | ||||
| -rw-r--r-- | lib/libedit/sig.h | 4 | ||||
| -rw-r--r-- | lib/libedit/terminal.c | 5 | ||||
| -rw-r--r-- | lib/libedit/terminal.h | 4 | ||||
| -rw-r--r-- | lib/libedit/tty.c | 6 | ||||
| -rw-r--r-- | lib/libedit/tty.h | 3 | ||||
| -rw-r--r-- | lib/libedit/vi.c | 5 |
28 files changed, 80 insertions, 67 deletions
diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c index ef56607e217..5a30235c6d3 100644 --- a/lib/libedit/chared.c +++ b/lib/libedit/chared.c @@ -1,4 +1,4 @@ -/* $NetBSD: chared.c,v 1.41 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: chared.c,v 1.42 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: chared.c,v 1.41 2016/02/14 14:49:34 christos Exp $"); +__RCSID("$NetBSD: chared.c,v 1.42 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -45,6 +45,8 @@ __RCSID("$NetBSD: chared.c,v 1.41 2016/02/14 14:49:34 christos Exp $"); * chared.c: Character editor utilities */ #include <stdlib.h> + +#include "histedit.h" #include "el.h" private void ch__clearmacro (EditLine *); diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h index 08a1c1d1953..44acdcf995e 100644 --- a/lib/libedit/chared.h +++ b/lib/libedit/chared.h @@ -1,4 +1,4 @@ -/* $NetBSD: chared.h,v 1.23 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: chared.h,v 1.24 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -43,8 +43,6 @@ #include <ctype.h> #include <string.h> -#include "histedit.h" - #define EL_MAXMACRO 10 /* diff --git a/lib/libedit/chartype.c b/lib/libedit/chartype.c index 2798f6a5cf5..fe925b1e08e 100644 --- a/lib/libedit/chartype.c +++ b/lib/libedit/chartype.c @@ -1,4 +1,4 @@ -/* $NetBSD: chartype.c,v 1.14 2016/02/14 14:47:48 christos Exp $ */ +/* $NetBSD: chartype.c,v 1.15 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -38,8 +38,10 @@ */ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: chartype.c,v 1.14 2016/02/14 14:47:48 christos Exp $"); +__RCSID("$NetBSD: chartype.c,v 1.15 2016/02/16 14:06:05 christos Exp $"); #endif /* not lint && not SCCSID */ + +#include "histedit.h" #include "el.h" #include <stdlib.h> diff --git a/lib/libedit/common.c b/lib/libedit/common.c index cf35ad76c78..1e7123c8801 100644 --- a/lib/libedit/common.c +++ b/lib/libedit/common.c @@ -1,4 +1,4 @@ -/* $NetBSD: common.c,v 1.31 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: common.c,v 1.32 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,13 +37,14 @@ #if 0 static char sccsid[] = "@(#)common.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: common.c,v 1.31 2016/02/14 14:49:34 christos Exp $"); +__RCSID("$NetBSD: common.c,v 1.32 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ /* * common.c: Common Editor functions */ +#include "histedit.h" #include "el.h" /* ed_end_of_file(): diff --git a/lib/libedit/el.c b/lib/libedit/el.c index 92d0b386ab1..254b945661f 100644 --- a/lib/libedit/el.c +++ b/lib/libedit/el.c @@ -1,4 +1,4 @@ -/* $NetBSD: el.c,v 1.77 2016/02/15 15:53:45 christos Exp $ */ +/* $NetBSD: el.c,v 1.78 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94"; #else -__RCSID("$NetBSD: el.c,v 1.77 2016/02/15 15:53:45 christos Exp $"); +__RCSID("$NetBSD: el.c,v 1.78 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -55,6 +55,7 @@ __RCSID("$NetBSD: el.c,v 1.77 2016/02/15 15:53:45 christos Exp $"); #include <langinfo.h> #endif +#include "histedit.h" #include "el.h" /* el_init(): diff --git a/lib/libedit/el.h b/lib/libedit/el.h index ae717130ecf..f8833925c36 100644 --- a/lib/libedit/el.h +++ b/lib/libedit/el.h @@ -1,4 +1,4 @@ -/* $NetBSD: el.h,v 1.26 2016/02/12 15:36:08 christos Exp $ */ +/* $NetBSD: el.h,v 1.27 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -46,7 +46,6 @@ #define VIDEFAULT #define ANCHOR -#include "histedit.h" #include "chartype.h" #include <stdio.h> #include <sys/types.h> diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c index c86ed19e8c0..e8fe2b6267e 100644 --- a/lib/libedit/emacs.c +++ b/lib/libedit/emacs.c @@ -1,4 +1,4 @@ -/* $NetBSD: emacs.c,v 1.27 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: emacs.c,v 1.28 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,13 +37,14 @@ #if 0 static char sccsid[] = "@(#)emacs.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: emacs.c,v 1.27 2016/02/14 14:49:34 christos Exp $"); +__RCSID("$NetBSD: emacs.c,v 1.28 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ /* * emacs.c: Emacs functions */ +#include "histedit.h" #include "el.h" /* em_delete_or_list(): diff --git a/lib/libedit/filecomplete.c b/lib/libedit/filecomplete.c index 576414d3ba6..a6990e0610a 100644 --- a/lib/libedit/filecomplete.c +++ b/lib/libedit/filecomplete.c @@ -1,4 +1,4 @@ -/* $NetBSD: filecomplete.c,v 1.34 2014/10/18 15:07:02 riz Exp $ */ +/* $NetBSD: filecomplete.c,v 1.35 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include "config.h" #if !defined(lint) && !defined(SCCSID) -__RCSID("$NetBSD: filecomplete.c,v 1.34 2014/10/18 15:07:02 riz Exp $"); +__RCSID("$NetBSD: filecomplete.c,v 1.35 2016/02/16 14:06:05 christos Exp $"); #endif /* not lint && not SCCSID */ #include <sys/types.h> @@ -47,9 +47,9 @@ __RCSID("$NetBSD: filecomplete.c,v 1.34 2014/10/18 15:07:02 riz Exp $"); #include <errno.h> #include <fcntl.h> +#include "histedit.h" #include "el.h" #include "fcns.h" /* for EL_NUM_FCNS */ -#include "histedit.h" #include "filecomplete.h" static const Char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@', diff --git a/lib/libedit/hist.c b/lib/libedit/hist.c index 77dbaabc467..dd72844313f 100644 --- a/lib/libedit/hist.c +++ b/lib/libedit/hist.c @@ -1,4 +1,4 @@ -/* $NetBSD: hist.c,v 1.20 2011/07/29 15:16:33 christos Exp $ */ +/* $NetBSD: hist.c,v 1.21 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: hist.c,v 1.20 2011/07/29 15:16:33 christos Exp $"); +__RCSID("$NetBSD: hist.c,v 1.21 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -45,6 +45,8 @@ __RCSID("$NetBSD: hist.c,v 1.20 2011/07/29 15:16:33 christos Exp $"); * hist.c: History access functions */ #include <stdlib.h> + +#include "histedit.h" #include "el.h" /* hist_init(): diff --git a/lib/libedit/hist.h b/lib/libedit/hist.h index 36c1c10f42c..3fe54d8e4a8 100644 --- a/lib/libedit/hist.h +++ b/lib/libedit/hist.h @@ -1,4 +1,4 @@ -/* $NetBSD: hist.h,v 1.15 2016/01/30 15:05:27 christos Exp $ */ +/* $NetBSD: hist.h,v 1.16 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -40,8 +40,6 @@ #ifndef _h_el_hist #define _h_el_hist -#include "histedit.h" - typedef int (*hist_fun_t)(void *, TYPE(HistEvent) *, int, ...); typedef struct el_history_t { diff --git a/lib/libedit/keymacro.c b/lib/libedit/keymacro.c index efca265b873..a7bb094c910 100644 --- a/lib/libedit/keymacro.c +++ b/lib/libedit/keymacro.c @@ -1,4 +1,4 @@ -/* $NetBSD: keymacro.c,v 1.9 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: keymacro.c,v 1.10 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)key.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: keymacro.c,v 1.9 2016/02/14 14:49:34 christos Exp $"); +__RCSID("$NetBSD: keymacro.c,v 1.10 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -66,6 +66,7 @@ __RCSID("$NetBSD: keymacro.c,v 1.9 2016/02/14 14:49:34 christos Exp $"); #include <string.h> #include <stdlib.h> +#include "histedit.h" #include "el.h" /* diff --git a/lib/libedit/makelist b/lib/libedit/makelist index 5e5b4861ba9..a5b56ad79a7 100644 --- a/lib/libedit/makelist +++ b/lib/libedit/makelist @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: makelist,v 1.19 2016/02/14 14:49:34 christos Exp $ +# $NetBSD: makelist,v 1.20 2016/02/16 14:06:05 christos Exp $ # # Copyright (c) 1992, 1993 # The Regents of the University of California. All rights reserved. @@ -93,7 +93,9 @@ _EOF cat $FILES | $AWK ' BEGIN { printf("/* Automatically generated file, do not edit */\n"); - printf("#include \"config.h\"\n#include \"el.h\"\n"); + printf("#include \"config.h\"\n"); + printf("#include \"histedit.h\"\n"); + printf("#include \"el.h\"\n"); printf("#include \"chartype.h\"\n"); printf("private const struct el_bindings_t el_func_help[] = {\n"); low = "abcdefghijklmnopqrstuvwxyz_"; @@ -175,7 +177,9 @@ _EOF cat $FILES | $AWK '/el_action_t/ { print $3 }' | sort | $AWK ' BEGIN { printf("/* Automatically generated file, do not edit */\n"); - printf("#include \"config.h\"\n#include \"el.h\"\n"); + printf("#include \"config.h\"\n"); + printf("#include \"histedit.h\"\n"); + printf("#include \"el.h\"\n"); printf("private const el_func_t el_func[] = {"); maxlen = 80; needn = 1; diff --git a/lib/libedit/map.c b/lib/libedit/map.c index 4e90a3aa251..9265dc5b396 100644 --- a/lib/libedit/map.c +++ b/lib/libedit/map.c @@ -1,4 +1,4 @@ -/* $NetBSD: map.c,v 1.37 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: map.c,v 1.38 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: map.c,v 1.37 2016/02/14 14:49:34 christos Exp $"); +__RCSID("$NetBSD: map.c,v 1.38 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -45,6 +45,8 @@ __RCSID("$NetBSD: map.c,v 1.37 2016/02/14 14:49:34 christos Exp $"); * map.c: Editor function definitions */ #include <stdlib.h> + +#include "histedit.h" #include "el.h" private void map_print_key(EditLine *, el_action_t *, const Char *); diff --git a/lib/libedit/parse.c b/lib/libedit/parse.c index 5058b61869b..012b8e97762 100644 --- a/lib/libedit/parse.c +++ b/lib/libedit/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.29 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: parse.c,v 1.30 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: parse.c,v 1.29 2016/02/14 14:49:34 christos Exp $"); +__RCSID("$NetBSD: parse.c,v 1.30 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -54,9 +54,11 @@ __RCSID("$NetBSD: parse.c,v 1.29 2016/02/14 14:49:34 christos Exp $"); * settc * setty */ -#include "el.h" #include <stdlib.h> +#include "histedit.h" +#include "el.h" + private const struct { const Char *name; int (*func)(EditLine *, int, const Char **); diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c index 48b2d27f872..648f1f7e9fd 100644 --- a/lib/libedit/prompt.c +++ b/lib/libedit/prompt.c @@ -1,4 +1,4 @@ -/* $NetBSD: prompt.c,v 1.20 2011/07/29 15:16:33 christos Exp $ */ +/* $NetBSD: prompt.c,v 1.21 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)prompt.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: prompt.c,v 1.20 2011/07/29 15:16:33 christos Exp $"); +__RCSID("$NetBSD: prompt.c,v 1.21 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -45,6 +45,8 @@ __RCSID("$NetBSD: prompt.c,v 1.20 2011/07/29 15:16:33 christos Exp $"); * prompt.c: Prompt printing functions */ #include <stdio.h> + +#include "histedit.h" #include "el.h" private Char *prompt_default(EditLine *); diff --git a/lib/libedit/prompt.h b/lib/libedit/prompt.h index af63b82b684..5ae7e0aa167 100644 --- a/lib/libedit/prompt.h +++ b/lib/libedit/prompt.h @@ -1,4 +1,4 @@ -/* $NetBSD: prompt.h,v 1.10 2009/12/30 22:37:40 christos Exp $ */ +/* $NetBSD: prompt.h,v 1.11 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -40,8 +40,6 @@ #ifndef _h_el_prompt #define _h_el_prompt -#include "histedit.h" - typedef Char *(*el_pfunc_t)(EditLine *); typedef struct el_prompt_t { diff --git a/lib/libedit/read.c b/lib/libedit/read.c index 5c33cdff446..74cb77f2db9 100644 --- a/lib/libedit/read.c +++ b/lib/libedit/read.c @@ -1,4 +1,4 @@ -/* $NetBSD: read.c,v 1.77 2016/02/14 14:47:48 christos Exp $ */ +/* $NetBSD: read.c,v 1.78 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: read.c,v 1.77 2016/02/14 14:47:48 christos Exp $"); +__RCSID("$NetBSD: read.c,v 1.78 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -50,6 +50,8 @@ __RCSID("$NetBSD: read.c,v 1.77 2016/02/14 14:47:48 christos Exp $"); #include <unistd.h> #include <stdlib.h> #include <limits.h> + +#include "histedit.h" #include "el.h" #define OKCMD -1 /* must be -1! */ diff --git a/lib/libedit/readline.c b/lib/libedit/readline.c index 5a322d99693..3dc3dbf38a6 100644 --- a/lib/libedit/readline.c +++ b/lib/libedit/readline.c @@ -1,4 +1,4 @@ -/* $NetBSD: readline.c,v 1.120 2016/02/15 23:36:30 christos Exp $ */ +/* $NetBSD: readline.c,v 1.121 2016/02/16 14:06:05 christos 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.120 2016/02/15 23:36:30 christos Exp $"); +__RCSID("$NetBSD: readline.c,v 1.121 2016/02/16 14:06:05 christos Exp $"); #endif /* not lint && not SCCSID */ #include <sys/types.h> @@ -51,9 +51,9 @@ __RCSID("$NetBSD: readline.c,v 1.120 2016/02/15 23:36:30 christos Exp $"); #include <vis.h> #include "readline/readline.h" +#include "histedit.h" #include "el.h" #include "fcns.h" /* for EL_NUM_FCNS */ -#include "histedit.h" #include "filecomplete.h" void rl_prep_terminal(int); diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c index f019d21e7cc..718eff923fd 100644 --- a/lib/libedit/refresh.c +++ b/lib/libedit/refresh.c @@ -1,4 +1,4 @@ -/* $NetBSD: refresh.c,v 1.39 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: refresh.c,v 1.40 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: refresh.c,v 1.39 2016/02/14 14:49:34 christos Exp $"); +__RCSID("$NetBSD: refresh.c,v 1.40 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -49,6 +49,7 @@ __RCSID("$NetBSD: refresh.c,v 1.39 2016/02/14 14:49:34 christos Exp $"); #include <unistd.h> #include <string.h> +#include "histedit.h" #include "el.h" private void re_nextline(EditLine *); diff --git a/lib/libedit/refresh.h b/lib/libedit/refresh.h index 658721167ab..a9743cbc411 100644 --- a/lib/libedit/refresh.h +++ b/lib/libedit/refresh.h @@ -1,4 +1,4 @@ -/* $NetBSD: refresh.h,v 1.7 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: refresh.h,v 1.8 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -40,8 +40,6 @@ #ifndef _h_el_refresh #define _h_el_refresh -#include "histedit.h" - typedef struct { coord_t r_cursor; /* Refresh cursor position */ int r_oldcv; /* Vertical locations */ diff --git a/lib/libedit/search.c b/lib/libedit/search.c index 1126f31fe66..bd09da9c1b2 100644 --- a/lib/libedit/search.c +++ b/lib/libedit/search.c @@ -1,4 +1,4 @@ -/* $NetBSD: search.c,v 1.33 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: search.c,v 1.34 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: search.c,v 1.33 2016/02/14 14:49:34 christos Exp $"); +__RCSID("$NetBSD: search.c,v 1.34 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -50,6 +50,8 @@ __RCSID("$NetBSD: search.c,v 1.33 2016/02/14 14:49:34 christos Exp $"); #elif defined(REGEXP) #include <regexp.h> #endif + +#include "histedit.h" #include "el.h" /* diff --git a/lib/libedit/search.h b/lib/libedit/search.h index d12349b9287..3c45b73787b 100644 --- a/lib/libedit/search.h +++ b/lib/libedit/search.h @@ -1,4 +1,4 @@ -/* $NetBSD: search.h,v 1.10 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: search.h,v 1.11 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -40,8 +40,6 @@ #ifndef _h_el_search #define _h_el_search -#include "histedit.h" - typedef struct el_search_t { Char *patbuf; /* The pattern buffer */ size_t patlen; /* Length of the pattern buffer */ diff --git a/lib/libedit/sig.h b/lib/libedit/sig.h index c957cfdf5a7..dde0f99348c 100644 --- a/lib/libedit/sig.h +++ b/lib/libedit/sig.h @@ -1,4 +1,4 @@ -/* $NetBSD: sig.h,v 1.8 2009/02/19 15:20:22 christos Exp $ */ +/* $NetBSD: sig.h,v 1.9 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -42,8 +42,6 @@ #include <signal.h> -#include "histedit.h" - /* * Define here all the signals we are going to handle * The _DO macro is used to iterate in the source code diff --git a/lib/libedit/terminal.c b/lib/libedit/terminal.c index d4bc911b24c..d4d73f43929 100644 --- a/lib/libedit/terminal.c +++ b/lib/libedit/terminal.c @@ -1,4 +1,4 @@ -/* $NetBSD: terminal.c,v 1.18 2016/02/15 22:53:38 christos Exp $ */ +/* $NetBSD: terminal.c,v 1.19 2016/02/16 14:06:05 christos 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: terminal.c,v 1.18 2016/02/15 22:53:38 christos Exp $"); +__RCSID("$NetBSD: terminal.c,v 1.19 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -73,6 +73,7 @@ __RCSID("$NetBSD: terminal.c,v 1.18 2016/02/15 22:53:38 christos Exp $"); #include <pthread.h> #endif +#include "histedit.h" #include "el.h" /* diff --git a/lib/libedit/terminal.h b/lib/libedit/terminal.h index 9f6cfe38901..d004cf3eb0f 100644 --- a/lib/libedit/terminal.h +++ b/lib/libedit/terminal.h @@ -1,4 +1,4 @@ -/* $NetBSD: terminal.h,v 1.5 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: terminal.h,v 1.6 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -40,8 +40,6 @@ #ifndef _h_el_terminal #define _h_el_terminal -#include "histedit.h" - typedef struct { /* Symbolic function key bindings */ const Char *name; /* name of the key */ int key; /* Index in termcap table */ diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c index 04daa7b5e64..c6941691681 100644 --- a/lib/libedit/tty.c +++ b/lib/libedit/tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: tty.c,v 1.51 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: tty.c,v 1.52 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: tty.c,v 1.51 2016/02/14 14:49:34 christos Exp $"); +__RCSID("$NetBSD: tty.c,v 1.52 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ @@ -49,6 +49,8 @@ __RCSID("$NetBSD: tty.c,v 1.51 2016/02/14 14:49:34 christos Exp $"); #include <unistd.h> /* for isatty */ #include <strings.h> /* for ffs */ #include <stdlib.h> /* for abort */ + +#include "histedit.h" #include "el.h" #include "tty.h" diff --git a/lib/libedit/tty.h b/lib/libedit/tty.h index 25f98f47fa4..c5b0f0fe8b8 100644 --- a/lib/libedit/tty.h +++ b/lib/libedit/tty.h @@ -1,4 +1,4 @@ -/* $NetBSD: tty.h,v 1.16 2016/02/16 14:04:24 christos Exp $ */ +/* $NetBSD: tty.h,v 1.17 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -40,7 +40,6 @@ #ifndef _h_el_tty #define _h_el_tty -#include "histedit.h" #include <termios.h> #include <unistd.h> diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c index 93420376639..52a1caac48e 100644 --- a/lib/libedit/vi.c +++ b/lib/libedit/vi.c @@ -1,4 +1,4 @@ -/* $NetBSD: vi.c,v 1.48 2016/02/14 14:49:34 christos Exp $ */ +/* $NetBSD: vi.c,v 1.49 2016/02/16 14:06:05 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -42,13 +42,14 @@ #if 0 static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: vi.c,v 1.48 2016/02/14 14:49:34 christos Exp $"); +__RCSID("$NetBSD: vi.c,v 1.49 2016/02/16 14:06:05 christos Exp $"); #endif #endif /* not lint && not SCCSID */ /* * vi.c: Vi mode commands. */ +#include "histedit.h" #include "el.h" private el_action_t cv_action(EditLine *, wint_t); |
