[src/trunk]: src/lib/libedit cleanup chartype.h includes (Ingo Schwarze)

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3813b008f23b
branches:  trunk
changeset: 343606:3813b008f23b
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Feb 16 14:08:25 2016 +0000

description:
cleanup chartype.h includes (Ingo Schwarze)

diffstat:

 lib/libedit/chared.c       |  5 +++--
 lib/libedit/chartype.c     |  8 +++++---
 lib/libedit/common.c       |  5 +++--
 lib/libedit/el.c           |  5 +++--
 lib/libedit/el.h           |  3 +--
 lib/libedit/eln.c          |  5 +++--
 lib/libedit/emacs.c        |  5 +++--
 lib/libedit/filecomplete.c |  5 +++--
 lib/libedit/hist.c         |  5 +++--
 lib/libedit/keymacro.c     |  5 +++--
 lib/libedit/makelist       |  5 +++--
 lib/libedit/map.c          |  5 +++--
 lib/libedit/parse.c        |  5 +++--
 lib/libedit/prompt.c       |  5 +++--
 lib/libedit/read.c         |  5 +++--
 lib/libedit/readline.c     |  5 +++--
 lib/libedit/refresh.c      |  5 +++--
 lib/libedit/search.c       |  5 +++--
 lib/libedit/sig.c          |  5 +++--
 lib/libedit/terminal.c     |  5 +++--
 lib/libedit/tty.c          |  5 +++--
 lib/libedit/vi.c           |  5 +++--
 22 files changed, 66 insertions(+), 45 deletions(-)

diffs (truncated from 561 to 300 lines):

diff -r f62328ad2073 -r 3813b008f23b lib/libedit/chared.c
--- a/lib/libedit/chared.c      Tue Feb 16 14:07:47 2016 +0000
+++ b/lib/libedit/chared.c      Tue Feb 16 14:08:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chared.c,v 1.42 2016/02/16 14:06:05 christos Exp $     */
+/*     $NetBSD: chared.c,v 1.43 2016/02/16 14:08:25 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.42 2016/02/16 14:06:05 christos Exp $");
+__RCSID("$NetBSD: chared.c,v 1.43 2016/02/16 14:08:25 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -47,6 +47,7 @@
 #include <stdlib.h>
 
 #include "histedit.h"
+#include "chartype.h"
 #include "el.h"
 
 private void ch__clearmacro (EditLine *);
diff -r f62328ad2073 -r 3813b008f23b lib/libedit/chartype.c
--- a/lib/libedit/chartype.c    Tue Feb 16 14:07:47 2016 +0000
+++ b/lib/libedit/chartype.c    Tue Feb 16 14:08:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chartype.c,v 1.15 2016/02/16 14:06:05 christos Exp $   */
+/*     $NetBSD: chartype.c,v 1.16 2016/02/16 14:08:25 christos Exp $   */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -38,12 +38,14 @@
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: chartype.c,v 1.15 2016/02/16 14:06:05 christos Exp $");
+__RCSID("$NetBSD: chartype.c,v 1.16 2016/02/16 14:08:25 christos Exp $");
 #endif /* not lint && not SCCSID */
 
+#include <stdlib.h>
+
 #include "histedit.h"
+#include "chartype.h"
 #include "el.h"
-#include <stdlib.h>
 
 #define CT_BUFSIZ ((size_t)1024)
 
diff -r f62328ad2073 -r 3813b008f23b lib/libedit/common.c
--- a/lib/libedit/common.c      Tue Feb 16 14:07:47 2016 +0000
+++ b/lib/libedit/common.c      Tue Feb 16 14:08:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: common.c,v 1.32 2016/02/16 14:06:05 christos Exp $     */
+/*     $NetBSD: common.c,v 1.33 2016/02/16 14:08:25 christos Exp $     */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)common.c   8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: common.c,v 1.32 2016/02/16 14:06:05 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.33 2016/02/16 14:08:25 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -45,6 +45,7 @@
  * common.c: Common Editor functions
  */
 #include "histedit.h"
+#include "chartype.h"
 #include "el.h"
 
 /* ed_end_of_file():
diff -r f62328ad2073 -r 3813b008f23b lib/libedit/el.c
--- a/lib/libedit/el.c  Tue Feb 16 14:07:47 2016 +0000
+++ b/lib/libedit/el.c  Tue Feb 16 14:08:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: el.c,v 1.78 2016/02/16 14:06:05 christos Exp $ */
+/*     $NetBSD: el.c,v 1.79 2016/02/16 14:08:25 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.78 2016/02/16 14:06:05 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.79 2016/02/16 14:08:25 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -56,6 +56,7 @@
 #endif
 
 #include "histedit.h"
+#include "chartype.h"
 #include "el.h"
 
 /* el_init():
diff -r f62328ad2073 -r 3813b008f23b lib/libedit/el.h
--- a/lib/libedit/el.h  Tue Feb 16 14:07:47 2016 +0000
+++ b/lib/libedit/el.h  Tue Feb 16 14:08:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: el.h,v 1.27 2016/02/16 14:06:05 christos Exp $ */
+/*     $NetBSD: el.h,v 1.28 2016/02/16 14:08:25 christos Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -46,7 +46,6 @@
 #define        VIDEFAULT
 #define        ANCHOR
 
-#include "chartype.h"
 #include <stdio.h>
 #include <sys/types.h>
 
diff -r f62328ad2073 -r 3813b008f23b lib/libedit/eln.c
--- a/lib/libedit/eln.c Tue Feb 16 14:07:47 2016 +0000
+++ b/lib/libedit/eln.c Tue Feb 16 14:08:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eln.c,v 1.23 2016/02/15 21:56:35 christos Exp $        */
+/*     $NetBSD: eln.c,v 1.24 2016/02/16 14:08:25 christos Exp $        */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -34,10 +34,11 @@
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: eln.c,v 1.23 2016/02/15 21:56:35 christos Exp $");
+__RCSID("$NetBSD: eln.c,v 1.24 2016/02/16 14:08:25 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include "histedit.h"
+#include "chartype.h"
 #include "el.h"
 #include "read.h"
 #include <errno.h>
diff -r f62328ad2073 -r 3813b008f23b lib/libedit/emacs.c
--- a/lib/libedit/emacs.c       Tue Feb 16 14:07:47 2016 +0000
+++ b/lib/libedit/emacs.c       Tue Feb 16 14:08:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: emacs.c,v 1.28 2016/02/16 14:06:05 christos Exp $      */
+/*     $NetBSD: emacs.c,v 1.29 2016/02/16 14:08:25 christos Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)emacs.c    8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: emacs.c,v 1.28 2016/02/16 14:06:05 christos Exp $");
+__RCSID("$NetBSD: emacs.c,v 1.29 2016/02/16 14:08:25 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -45,6 +45,7 @@
  * emacs.c: Emacs functions
  */
 #include "histedit.h"
+#include "chartype.h"
 #include "el.h"
 
 /* em_delete_or_list():
diff -r f62328ad2073 -r 3813b008f23b lib/libedit/filecomplete.c
--- a/lib/libedit/filecomplete.c        Tue Feb 16 14:07:47 2016 +0000
+++ b/lib/libedit/filecomplete.c        Tue Feb 16 14:08:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: filecomplete.c,v 1.35 2016/02/16 14:06:05 christos Exp $       */
+/*     $NetBSD: filecomplete.c,v 1.36 2016/02/16 14:08:25 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.35 2016/02/16 14:06:05 christos Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.36 2016/02/16 14:08:25 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include <sys/types.h>
@@ -48,6 +48,7 @@
 #include <fcntl.h>
 
 #include "histedit.h"
+#include "chartype.h"
 #include "el.h"
 #include "fcns.h"              /* for EL_NUM_FCNS */
 #include "filecomplete.h"
diff -r f62328ad2073 -r 3813b008f23b lib/libedit/hist.c
--- a/lib/libedit/hist.c        Tue Feb 16 14:07:47 2016 +0000
+++ b/lib/libedit/hist.c        Tue Feb 16 14:08:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hist.c,v 1.21 2016/02/16 14:06:05 christos Exp $       */
+/*     $NetBSD: hist.c,v 1.22 2016/02/16 14:08:25 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.21 2016/02/16 14:06:05 christos Exp $");
+__RCSID("$NetBSD: hist.c,v 1.22 2016/02/16 14:08:25 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -47,6 +47,7 @@
 #include <stdlib.h>
 
 #include "histedit.h"
+#include "chartype.h"
 #include "el.h"
 
 /* hist_init():
diff -r f62328ad2073 -r 3813b008f23b lib/libedit/keymacro.c
--- a/lib/libedit/keymacro.c    Tue Feb 16 14:07:47 2016 +0000
+++ b/lib/libedit/keymacro.c    Tue Feb 16 14:08:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: keymacro.c,v 1.10 2016/02/16 14:06:05 christos Exp $   */
+/*     $NetBSD: keymacro.c,v 1.11 2016/02/16 14:08:25 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.10 2016/02/16 14:06:05 christos Exp $");
+__RCSID("$NetBSD: keymacro.c,v 1.11 2016/02/16 14:08:25 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -67,6 +67,7 @@
 #include <stdlib.h>
 
 #include "histedit.h"
+#include "chartype.h"
 #include "el.h"
 
 /*
diff -r f62328ad2073 -r 3813b008f23b lib/libedit/makelist
--- a/lib/libedit/makelist      Tue Feb 16 14:07:47 2016 +0000
+++ b/lib/libedit/makelist      Tue Feb 16 14:08:25 2016 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#      $NetBSD: makelist,v 1.20 2016/02/16 14:06:05 christos Exp $
+#      $NetBSD: makelist,v 1.21 2016/02/16 14:08:25 christos Exp $
 #
 # Copyright (c) 1992, 1993
 #      The Regents of the University of California.  All rights reserved.
@@ -95,8 +95,8 @@
            printf("/* Automatically generated file, do not edit */\n");
            printf("#include \"config.h\"\n");
            printf("#include \"histedit.h\"\n");
+           printf("#include \"chartype.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_";
            high = "ABCDEFGHIJKLMNOPQRSTUVWXYZ_";
@@ -179,6 +179,7 @@
            printf("/* Automatically generated file, do not edit */\n");
            printf("#include \"config.h\"\n");
            printf("#include \"histedit.h\"\n");
+           printf("#include \"chartype.h\"\n");
            printf("#include \"el.h\"\n");
            printf("private const el_func_t el_func[] = {");
            maxlen = 80;
diff -r f62328ad2073 -r 3813b008f23b lib/libedit/map.c
--- a/lib/libedit/map.c Tue Feb 16 14:07:47 2016 +0000
+++ b/lib/libedit/map.c Tue Feb 16 14:08:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: map.c,v 1.38 2016/02/16 14:06:05 christos Exp $        */
+/*     $NetBSD: map.c,v 1.39 2016/02/16 14:08:25 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.38 2016/02/16 14:06:05 christos Exp $");
+__RCSID("$NetBSD: map.c,v 1.39 2016/02/16 14:08:25 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -47,6 +47,7 @@
 #include <stdlib.h>
 
 #include "histedit.h"
+#include "chartype.h"
 #include "el.h"