From 6f6878df033ca78677df1c0641bb398b24e9780b Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Sat, 25 Dec 2010 23:43:30 +0000
Subject: [PATCH] defs.h already includes nbtool_config.h, so don't do it
 twice.

---
 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(-)

diff --git a/external/bsd/byacc/dist/closure.c b/external/bsd/byacc/dist/closure.c
index a327085da2cb..5ccd84176162 100644
--- a/external/bsd/byacc/dist/closure.c
+++ b/external/bsd/byacc/dist/closure.c
@@ -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 --git a/external/bsd/byacc/dist/error.c b/external/bsd/byacc/dist/error.c
index 8e328184c269..f8d32936a8ef 100644
--- a/external/bsd/byacc/dist/error.c
+++ b/external/bsd/byacc/dist/error.c
@@ -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 <sys/cdefs.h>
-__RCSID("$NetBSD: error.c,v 1.5 2010/12/25 19:24:28 joerg Exp $");
 #include "defs.h"
 
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: error.c,v 1.6 2010/12/25 23:43:30 christos Exp $");
 
 /* routines for printing error messages  */
 
diff --git a/external/bsd/byacc/dist/graph.c b/external/bsd/byacc/dist/graph.c
index 10dcb5dc1240..b7d9c494e1a7 100644
--- a/external/bsd/byacc/dist/graph.c
+++ b/external/bsd/byacc/dist/graph.c
@@ -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 --git a/external/bsd/byacc/dist/lalr.c b/external/bsd/byacc/dist/lalr.c
index 69359c591631..b91c3e8fedbe 100644
--- a/external/bsd/byacc/dist/lalr.c
+++ b/external/bsd/byacc/dist/lalr.c
@@ -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 --git a/external/bsd/byacc/dist/lr0.c b/external/bsd/byacc/dist/lr0.c
index 7ade94c231a1..107c82ed11ed 100644
--- a/external/bsd/byacc/dist/lr0.c
+++ b/external/bsd/byacc/dist/lr0.c
@@ -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 --git a/external/bsd/byacc/dist/main.c b/external/bsd/byacc/dist/main.c
index bd8b75032e33..9c8dfeb88674 100644
--- a/external/bsd/byacc/dist/main.c
+++ b/external/bsd/byacc/dist/main.c
@@ -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 --git a/external/bsd/byacc/dist/mkpar.c b/external/bsd/byacc/dist/mkpar.c
index a5c6d5854263..133c28286e54 100644
--- a/external/bsd/byacc/dist/mkpar.c
+++ b/external/bsd/byacc/dist/mkpar.c
@@ -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 --git a/external/bsd/byacc/dist/output.c b/external/bsd/byacc/dist/output.c
index 223b36d50b56..64279c80fc89 100644
--- a/external/bsd/byacc/dist/output.c
+++ b/external/bsd/byacc/dist/output.c
@@ -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 --git a/external/bsd/byacc/dist/reader.c b/external/bsd/byacc/dist/reader.c
index 1c4112162140..705d7bdfa990 100644
--- a/external/bsd/byacc/dist/reader.c
+++ b/external/bsd/byacc/dist/reader.c
@@ -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 --git a/external/bsd/byacc/dist/skeleton.c b/external/bsd/byacc/dist/skeleton.c
index 512337e5b809..51ae98116421 100644
--- a/external/bsd/byacc/dist/skeleton.c
+++ b/external/bsd/byacc/dist/skeleton.c
@@ -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 --git a/external/bsd/byacc/dist/symtab.c b/external/bsd/byacc/dist/symtab.c
index 965de6b745d2..6855413df625 100644
--- a/external/bsd/byacc/dist/symtab.c
+++ b/external/bsd/byacc/dist/symtab.c
@@ -1,14 +1,11 @@
-/*	$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 <sys/cdefs.h>
-__RCSID("$NetBSD: symtab.c,v 1.4 2010/12/25 19:24:28 joerg Exp $");
 
 #include "defs.h"
 
+#include <sys/cdefs.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 --git a/external/bsd/byacc/dist/verbose.c b/external/bsd/byacc/dist/verbose.c
index a1e3c8dccd41..af0c4cf8d8b9 100644
--- a/external/bsd/byacc/dist/verbose.c
+++ b/external/bsd/byacc/dist/verbose.c
@@ -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 --git a/external/bsd/byacc/dist/warshall.c b/external/bsd/byacc/dist/warshall.c
index 69f1536f07c4..254f0e46f319 100644
--- a/external/bsd/byacc/dist/warshall.c
+++ b/external/bsd/byacc/dist/warshall.c
@@ -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)