[src/trunk]: src/external/bsd/byacc/dist defs.h already includes nbtool_confi...

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

details:   https://anonhg.NetBSD.org/src/rev/c6ea02f06eab
branches:  trunk
changeset: 760083:c6ea02f06eab
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Dec 25 23:43:30 2010 +0000

description:
defs.h already includes nbtool_config.h, so don't do it twice.

diffstat:

 external/bsd/byacc/dist/closure.c  |   7 ++-----
 external/bsd/byacc/dist/error.c    |  10 +++-------
 external/bsd/byacc/dist/graph.c    |   8 ++------
 external/bsd/byacc/dist/lalr.c     |   8 ++------
 external/bsd/byacc/dist/lr0.c      |   8 ++------
 external/bsd/byacc/dist/main.c     |  10 +++-------
 external/bsd/byacc/dist/mkpar.c    |   8 ++------
 external/bsd/byacc/dist/output.c   |  10 +++-------
 external/bsd/byacc/dist/reader.c   |   8 ++------
 external/bsd/byacc/dist/skeleton.c |   8 ++------
 external/bsd/byacc/dist/symtab.c   |  11 ++++-------
 external/bsd/byacc/dist/verbose.c  |  10 +++-------
 external/bsd/byacc/dist/warshall.c |  10 +++-------
 13 files changed, 33 insertions(+), 83 deletions(-)

diffs (265 lines):

diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/closure.c
--- a/external/bsd/byacc/dist/closure.c Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/closure.c Sat Dec 25 23:43:30 2010 +0000
@@ -1,13 +1,10 @@
-/*     $NetBSD: closure.c,v 1.4 2010/12/25 19:24:28 joerg Exp $        */
+/*     $NetBSD: closure.c,v 1.5 2010/12/25 23:43:30 christos Exp $     */
 /* Id: closure.c,v 1.9 2010/06/09 08:21:47 tom Exp */
 
 #include "defs.h"
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: closure.c,v 1.4 2010/12/25 19:24:28 joerg Exp $");
+__RCSID("$NetBSD: closure.c,v 1.5 2010/12/25 23:43:30 christos Exp $");
 
 Value_t *itemset;
 Value_t *itemsetend;
diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/error.c
--- a/external/bsd/byacc/dist/error.c   Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/error.c   Sat Dec 25 23:43:30 2010 +0000
@@ -1,14 +1,10 @@
-/*     $NetBSD: error.c,v 1.5 2010/12/25 19:24:28 joerg Exp $  */
+/*     $NetBSD: error.c,v 1.6 2010/12/25 23:43:30 christos Exp $       */
 /* Id: error.c,v 1.8 2010/11/24 15:10:20 tom Exp */
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
+#include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: error.c,v 1.5 2010/12/25 19:24:28 joerg Exp $");
-#include "defs.h"
-
+__RCSID("$NetBSD: error.c,v 1.6 2010/12/25 23:43:30 christos Exp $");
 
 /* routines for printing error messages  */
 
diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/graph.c
--- a/external/bsd/byacc/dist/graph.c   Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/graph.c   Sat Dec 25 23:43:30 2010 +0000
@@ -1,14 +1,10 @@
-/*     $NetBSD: graph.c,v 1.3 2010/12/25 19:24:28 joerg Exp $  */
+/*     $NetBSD: graph.c,v 1.4 2010/12/25 23:43:30 christos Exp $       */
 /* Id: graph.c,v 1.7 2009/10/27 09:25:20 tom Exp */
 
 #include "defs.h"
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: graph.c,v 1.3 2010/12/25 19:24:28 joerg Exp $");
+__RCSID("$NetBSD: graph.c,v 1.4 2010/12/25 23:43:30 christos Exp $");
 
 static void graph_state(int stateno);
 static void graph_LA(int ruleno);
diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/lalr.c
--- a/external/bsd/byacc/dist/lalr.c    Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/lalr.c    Sat Dec 25 23:43:30 2010 +0000
@@ -1,14 +1,10 @@
-/*     $NetBSD: lalr.c,v 1.3 2010/12/25 19:24:28 joerg Exp $   */
+/*     $NetBSD: lalr.c,v 1.4 2010/12/25 23:43:30 christos Exp $        */
 /* Id: lalr.c,v 1.9 2009/10/27 09:49:27 tom Exp */
 
 #include "defs.h"
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: lalr.c,v 1.3 2010/12/25 19:24:28 joerg Exp $");
+__RCSID("$NetBSD: lalr.c,v 1.4 2010/12/25 23:43:30 christos Exp $");
 
 typedef struct shorts
 {
diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/lr0.c
--- a/external/bsd/byacc/dist/lr0.c     Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/lr0.c     Sat Dec 25 23:43:30 2010 +0000
@@ -1,14 +1,10 @@
-/*     $NetBSD: lr0.c,v 1.4 2010/12/25 19:24:28 joerg Exp $    */
+/*     $NetBSD: lr0.c,v 1.5 2010/12/25 23:43:30 christos Exp $ */
 /* Id: lr0.c,v 1.12 2010/06/09 08:53:17 tom Exp */
 
 #include "defs.h"
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: lr0.c,v 1.4 2010/12/25 19:24:28 joerg Exp $");
+__RCSID("$NetBSD: lr0.c,v 1.5 2010/12/25 23:43:30 christos Exp $");
 
 static core *new_state(int symbol);
 static Value_t get_state(int symbol);
diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/main.c
--- a/external/bsd/byacc/dist/main.c    Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/main.c    Sat Dec 25 23:43:30 2010 +0000
@@ -1,14 +1,10 @@
-/*     $NetBSD: main.c,v 1.5 2010/12/25 19:24:28 joerg Exp $   */
+/*     $NetBSD: main.c,v 1.6 2010/12/25 23:43:30 christos Exp $        */
 /* Id: main.c,v 1.30 2010/11/24 15:13:39 tom Exp */
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
+#include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.5 2010/12/25 19:24:28 joerg Exp $");
-
-#include "defs.h"
+__RCSID("$NetBSD: main.c,v 1.6 2010/12/25 23:43:30 christos Exp $");
 
 #include <signal.h>
 #include <unistd.h>            /* for _exit() */
diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/mkpar.c
--- a/external/bsd/byacc/dist/mkpar.c   Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/mkpar.c   Sat Dec 25 23:43:30 2010 +0000
@@ -1,14 +1,10 @@
-/*     $NetBSD: mkpar.c,v 1.4 2010/12/25 19:24:28 joerg Exp $  */
+/*     $NetBSD: mkpar.c,v 1.5 2010/12/25 23:43:30 christos Exp $       */
 /* Id: mkpar.c,v 1.11 2010/06/09 08:53:17 tom Exp */
 
 #include "defs.h"
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkpar.c,v 1.4 2010/12/25 19:24:28 joerg Exp $");
+__RCSID("$NetBSD: mkpar.c,v 1.5 2010/12/25 23:43:30 christos Exp $");
 
 static action *add_reduce(action *actions, int ruleno, int symbol);
 static action *add_reductions(int stateno, action *actions);
diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/output.c
--- a/external/bsd/byacc/dist/output.c  Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/output.c  Sat Dec 25 23:43:30 2010 +0000
@@ -1,14 +1,10 @@
-/*    $NetBSD: output.c,v 1.6 2010/12/25 19:24:28 joerg Exp $  */
+/*    $NetBSD: output.c,v 1.7 2010/12/25 23:43:30 christos Exp $  */
 /* Id: output.c,v 1.37 2010/11/27 17:28:29 tom Exp */
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
+#include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: output.c,v 1.6 2010/12/25 19:24:28 joerg Exp $");
-
-#include "defs.h"
+__RCSID("$NetBSD: output.c,v 1.7 2010/12/25 23:43:30 christos Exp $");
 
 #define StaticOrR      (rflag ? "" : "static ")
 #define CountLine(fp)   (!rflag || ((fp) == code_file))
diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/reader.c
--- a/external/bsd/byacc/dist/reader.c  Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/reader.c  Sat Dec 25 23:43:30 2010 +0000
@@ -1,14 +1,10 @@
-/*     $NetBSD: reader.c,v 1.5 2010/12/25 19:24:28 joerg Exp $ */
+/*     $NetBSD: reader.c,v 1.6 2010/12/25 23:43:30 christos Exp $      */
 /* Id: reader.c,v 1.31 2010/11/26 12:30:40 tom Exp */
 
 #include "defs.h"
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: reader.c,v 1.5 2010/12/25 19:24:28 joerg Exp $");
+__RCSID("$NetBSD: reader.c,v 1.6 2010/12/25 23:43:30 christos Exp $");
 
 /*  The line size must be a positive integer.  One hundred was chosen  */
 /*  because few lines in Yacc input grammars exceed 100 characters.    */
diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/skeleton.c
--- a/external/bsd/byacc/dist/skeleton.c        Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/skeleton.c        Sat Dec 25 23:43:30 2010 +0000
@@ -1,14 +1,10 @@
-/*     $NetBSD: skeleton.c,v 1.8 2010/12/25 19:24:28 joerg Exp $       */
+/*     $NetBSD: skeleton.c,v 1.9 2010/12/25 23:43:30 christos Exp $    */
 /* Id: skeleton.c,v 1.27 2010/11/26 17:24:00 tom Exp */
 
 #include "defs.h"
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: skeleton.c,v 1.8 2010/12/25 19:24:28 joerg Exp $");
+__RCSID("$NetBSD: skeleton.c,v 1.9 2010/12/25 23:43:30 christos Exp $");
 
 /*  The definition of yysccsid in the banner should be replaced with   */
 /*  a #pragma ident directive if the target C compiler supports                */
diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/symtab.c
--- a/external/bsd/byacc/dist/symtab.c  Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/symtab.c  Sat Dec 25 23:43:30 2010 +0000
@@ -1,13 +1,10 @@
-/*     $NetBSD: symtab.c,v 1.4 2010/12/25 19:24:28 joerg Exp $ */
+/*     $NetBSD: symtab.c,v 1.5 2010/12/25 23:43:30 christos Exp $      */
 /* Id: symtab.c,v 1.9 2010/11/24 15:12:29 tom Exp */
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
+
+#include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: symtab.c,v 1.4 2010/12/25 19:24:28 joerg Exp $");
-
-#include "defs.h"
+__RCSID("$NetBSD: symtab.c,v 1.5 2010/12/25 23:43:30 christos Exp $");
 
 /* TABLE_SIZE is the number of entries in the symbol table. */
 /* TABLE_SIZE must be a power of two.                      */
diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/verbose.c
--- a/external/bsd/byacc/dist/verbose.c Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/verbose.c Sat Dec 25 23:43:30 2010 +0000
@@ -1,14 +1,10 @@
-/*     $NetBSD: verbose.c,v 1.4 2010/12/25 19:24:28 joerg Exp $        */
+/*     $NetBSD: verbose.c,v 1.5 2010/12/25 23:43:30 christos Exp $     */
 /* Id: verbose.c,v 1.9 2010/06/09 08:58:29 tom Exp */
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
+#include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: verbose.c,v 1.4 2010/12/25 19:24:28 joerg Exp $");
-
-#include "defs.h"
+__RCSID("$NetBSD: verbose.c,v 1.5 2010/12/25 23:43:30 christos Exp $");
 
 static void log_conflicts(void);
 static void log_unused(void);
diff -r 3819ceb5d451 -r c6ea02f06eab external/bsd/byacc/dist/warshall.c
--- a/external/bsd/byacc/dist/warshall.c        Sat Dec 25 23:36:59 2010 +0000
+++ b/external/bsd/byacc/dist/warshall.c        Sat Dec 25 23:43:30 2010 +0000
@@ -1,14 +1,10 @@
-/*     $NetBSD: warshall.c,v 1.4 2010/12/25 19:24:28 joerg Exp $       */
+/*     $NetBSD: warshall.c,v 1.5 2010/12/25 23:43:30 christos Exp $    */
 /* Id: warshall.c,v 1.7 2010/06/06 22:48:51 tom Exp */
 
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
+#include "defs.h"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: warshall.c,v 1.4 2010/12/25 19:24:28 joerg Exp $");
-
-#include "defs.h"
+__RCSID("$NetBSD: warshall.c,v 1.5 2010/12/25 23:43:30 christos Exp $");
 
 static void
 transitive_closure(unsigned *R, int n)