Module Name: src
Committed By: jakllsch
Date: Sun Dec 23 20:27:23 UTC 2018
Modified Files:
src/external/bsd/byacc/dist: closure.c error.c graph.c lalr.c lr0.c
main.c mkpar.c output.c reader.c symtab.c verbose.c warshall.c
Log Message:
Restore "defs.h", <sys/cdefs.h> #include ordering from before today's
update. Fixes tools build on, for instance, Linux hosts.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/byacc/dist/closure.c \
src/external/bsd/byacc/dist/symtab.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/byacc/dist/error.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/dist/graph.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/byacc/dist/lalr.c \
src/external/bsd/byacc/dist/warshall.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/byacc/dist/lr0.c \
src/external/bsd/byacc/dist/mkpar.c src/external/bsd/byacc/dist/verbose.c
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/byacc/dist/main.c \
src/external/bsd/byacc/dist/reader.c
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/byacc/dist/output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/byacc/dist/closure.c
diff -u src/external/bsd/byacc/dist/closure.c:1.10 src/external/bsd/byacc/dist/closure.c:1.11
--- src/external/bsd/byacc/dist/closure.c:1.10 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/closure.c Sun Dec 23 20:27:23 2018
@@ -1,12 +1,12 @@
-/* $NetBSD: closure.c,v 1.10 2018/12/23 15:38:53 christos Exp $ */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: closure.c,v 1.10 2018/12/23 15:38:53 christos Exp $");
+/* $NetBSD: closure.c,v 1.11 2018/12/23 20:27:23 jakllsch Exp $ */
/* Id: closure.c,v 1.11 2014/09/18 00:40:07 tom Exp */
#include "defs.h"
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: closure.c,v 1.11 2018/12/23 20:27:23 jakllsch Exp $");
+
Value_t *itemset;
Value_t *itemsetend;
unsigned *ruleset;
Index: src/external/bsd/byacc/dist/symtab.c
diff -u src/external/bsd/byacc/dist/symtab.c:1.10 src/external/bsd/byacc/dist/symtab.c:1.11
--- src/external/bsd/byacc/dist/symtab.c:1.10 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/symtab.c Sun Dec 23 20:27:23 2018
@@ -1,12 +1,12 @@
-/* $NetBSD: symtab.c,v 1.10 2018/12/23 15:38:53 christos Exp $ */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: symtab.c,v 1.10 2018/12/23 15:38:53 christos Exp $");
+/* $NetBSD: symtab.c,v 1.11 2018/12/23 20:27:23 jakllsch Exp $ */
/* Id: symtab.c,v 1.11 2014/03/26 00:17:09 Tom.Shields Exp */
#include "defs.h"
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: symtab.c,v 1.11 2018/12/23 20:27:23 jakllsch Exp $");
+
/* TABLE_SIZE is the number of entries in the symbol table. */
/* TABLE_SIZE must be a power of two. */
Index: src/external/bsd/byacc/dist/error.c
diff -u src/external/bsd/byacc/dist/error.c:1.13 src/external/bsd/byacc/dist/error.c:1.14
--- src/external/bsd/byacc/dist/error.c:1.13 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/error.c Sun Dec 23 20:27:23 2018
@@ -1,15 +1,13 @@
-/* $NetBSD: error.c,v 1.13 2018/12/23 15:38:53 christos Exp $ */
+/* $NetBSD: error.c,v 1.14 2018/12/23 20:27:23 jakllsch Exp $ */
+#include "defs.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: error.c,v 1.13 2018/12/23 15:38:53 christos Exp $");
-
+__RCSID("$NetBSD: error.c,v 1.14 2018/12/23 20:27:23 jakllsch Exp $");
/* Id: error.c,v 1.14 2016/12/02 18:35:55 tom Exp */
-#include "defs.h"
/* routines for printing error messages */
-
__dead void
fatal(const char *msg)
{
Index: src/external/bsd/byacc/dist/graph.c
diff -u src/external/bsd/byacc/dist/graph.c:1.7 src/external/bsd/byacc/dist/graph.c:1.8
--- src/external/bsd/byacc/dist/graph.c:1.7 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/graph.c Sun Dec 23 20:27:23 2018
@@ -1,11 +1,10 @@
-/* $NetBSD: graph.c,v 1.7 2018/12/23 15:38:53 christos Exp $ */
+/* $NetBSD: graph.c,v 1.8 2018/12/23 20:27:23 jakllsch Exp $ */
+#include "defs.h"
/* Id: graph.c,v 1.8 2014/02/19 00:46:57 Tom.Shields Exp */
#include <sys/cdefs.h>
-__RCSID("$NetBSD: graph.c,v 1.7 2018/12/23 15:38:53 christos Exp $");
-
-#include "defs.h"
+__RCSID("$NetBSD: graph.c,v 1.8 2018/12/23 20:27:23 jakllsch Exp $");
static void graph_state(int stateno);
static void graph_LA(int ruleno);
Index: src/external/bsd/byacc/dist/lalr.c
diff -u src/external/bsd/byacc/dist/lalr.c:1.9 src/external/bsd/byacc/dist/lalr.c:1.10
--- src/external/bsd/byacc/dist/lalr.c:1.9 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/lalr.c Sun Dec 23 20:27:23 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: lalr.c,v 1.9 2018/12/23 15:38:53 christos Exp $ */
+/* $NetBSD: lalr.c,v 1.10 2018/12/23 20:27:23 jakllsch Exp $ */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: lalr.c,v 1.9 2018/12/23 15:38:53 christos Exp $");
-
-/* Id: lalr.c,v 1.12 2016/06/07 00:28:03 tom Exp */
#include "defs.h"
+/* Id: lalr.c,v 1.12 2016/06/07 00:28:03 tom Exp */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: lalr.c,v 1.10 2018/12/23 20:27:23 jakllsch Exp $");
typedef struct shorts
{
Index: src/external/bsd/byacc/dist/warshall.c
diff -u src/external/bsd/byacc/dist/warshall.c:1.9 src/external/bsd/byacc/dist/warshall.c:1.10
--- src/external/bsd/byacc/dist/warshall.c:1.9 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/warshall.c Sun Dec 23 20:27:23 2018
@@ -1,12 +1,12 @@
-/* $NetBSD: warshall.c,v 1.9 2018/12/23 15:38:53 christos Exp $ */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: warshall.c,v 1.9 2018/12/23 15:38:53 christos Exp $");
+/* $NetBSD: warshall.c,v 1.10 2018/12/23 20:27:23 jakllsch Exp $ */
/* Id: warshall.c,v 1.7 2010/06/06 22:48:51 tom Exp */
#include "defs.h"
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: warshall.c,v 1.10 2018/12/23 20:27:23 jakllsch Exp $");
+
static void
transitive_closure(unsigned *R, int n)
{
Index: src/external/bsd/byacc/dist/lr0.c
diff -u src/external/bsd/byacc/dist/lr0.c:1.11 src/external/bsd/byacc/dist/lr0.c:1.12
--- src/external/bsd/byacc/dist/lr0.c:1.11 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/lr0.c Sun Dec 23 20:27:23 2018
@@ -1,12 +1,12 @@
-/* $NetBSD: lr0.c,v 1.11 2018/12/23 15:38:53 christos Exp $ */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: lr0.c,v 1.11 2018/12/23 15:38:53 christos Exp $");
+/* $NetBSD: lr0.c,v 1.12 2018/12/23 20:27:23 jakllsch Exp $ */
/* Id: lr0.c,v 1.19 2016/06/07 00:21:53 tom Exp */
#include "defs.h"
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: lr0.c,v 1.12 2018/12/23 20:27:23 jakllsch Exp $");
+
static core *new_state(int symbol);
static Value_t get_state(int symbol);
static void allocate_itemsets(void);
Index: src/external/bsd/byacc/dist/mkpar.c
diff -u src/external/bsd/byacc/dist/mkpar.c:1.11 src/external/bsd/byacc/dist/mkpar.c:1.12
--- src/external/bsd/byacc/dist/mkpar.c:1.11 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/mkpar.c Sun Dec 23 20:27:23 2018
@@ -1,12 +1,12 @@
-/* $NetBSD: mkpar.c,v 1.11 2018/12/23 15:38:53 christos Exp $ */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: mkpar.c,v 1.11 2018/12/23 15:38:53 christos Exp $");
+/* $NetBSD: mkpar.c,v 1.12 2018/12/23 20:27:23 jakllsch Exp $ */
/* Id: mkpar.c,v 1.15 2016/06/07 00:22:12 tom Exp */
#include "defs.h"
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: mkpar.c,v 1.12 2018/12/23 20:27:23 jakllsch Exp $");
+
#define NotSuppressed(p) ((p)->suppressed == 0)
#if defined(YYBTYACC)
Index: src/external/bsd/byacc/dist/verbose.c
diff -u src/external/bsd/byacc/dist/verbose.c:1.11 src/external/bsd/byacc/dist/verbose.c:1.12
--- src/external/bsd/byacc/dist/verbose.c:1.11 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/verbose.c Sun Dec 23 20:27:23 2018
@@ -1,12 +1,12 @@
-/* $NetBSD: verbose.c,v 1.11 2018/12/23 15:38:53 christos Exp $ */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: verbose.c,v 1.11 2018/12/23 15:38:53 christos Exp $");
+/* $NetBSD: verbose.c,v 1.12 2018/12/23 20:27:23 jakllsch Exp $ */
/* Id: verbose.c,v 1.12 2016/06/07 00:22:05 tom Exp */
#include "defs.h"
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: verbose.c,v 1.12 2018/12/23 20:27:23 jakllsch Exp $");
+
static void log_conflicts(void);
static void log_unused(void);
static void print_actions(int stateno);
Index: src/external/bsd/byacc/dist/main.c
diff -u src/external/bsd/byacc/dist/main.c:1.15 src/external/bsd/byacc/dist/main.c:1.16
--- src/external/bsd/byacc/dist/main.c:1.15 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/main.c Sun Dec 23 20:27:23 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: main.c,v 1.15 2018/12/23 15:38:53 christos Exp $ */
+/* $NetBSD: main.c,v 1.16 2018/12/23 20:27:23 jakllsch Exp $ */
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.15 2018/12/23 15:38:53 christos Exp $");
+#include "defs.h"
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: main.c,v 1.16 2018/12/23 20:27:23 jakllsch Exp $");
/* Id: main.c,v 1.61 2017/12/04 17:50:02 erik.b.andersen Exp */
-#include "defs.h"
#include <signal.h>
#ifndef _WIN32
Index: src/external/bsd/byacc/dist/reader.c
diff -u src/external/bsd/byacc/dist/reader.c:1.15 src/external/bsd/byacc/dist/reader.c:1.16
--- src/external/bsd/byacc/dist/reader.c:1.15 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/reader.c Sun Dec 23 20:27:23 2018
@@ -1,12 +1,12 @@
-/* $NetBSD: reader.c,v 1.15 2018/12/23 15:38:53 christos Exp $ */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: reader.c,v 1.15 2018/12/23 15:38:53 christos Exp $");
+/* $NetBSD: reader.c,v 1.16 2018/12/23 20:27:23 jakllsch Exp $ */
/* Id: reader.c,v 1.74 2017/12/04 17:50:02 tom Exp */
#include "defs.h"
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: reader.c,v 1.16 2018/12/23 20:27:23 jakllsch Exp $");
+
/* The line size must be a positive integer. One hundred was chosen */
/* because few lines in Yacc input grammars exceed 100 characters. */
/* Note that if a line exceeds LINESIZE characters, the line buffer */
Index: src/external/bsd/byacc/dist/output.c
diff -u src/external/bsd/byacc/dist/output.c:1.19 src/external/bsd/byacc/dist/output.c:1.20
--- src/external/bsd/byacc/dist/output.c:1.19 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/output.c Sun Dec 23 20:27:23 2018
@@ -1,12 +1,12 @@
-/* $NetBSD: output.c,v 1.19 2018/12/23 15:38:53 christos Exp $ */
-
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: output.c,v 1.19 2018/12/23 15:38:53 christos Exp $");
+/* $NetBSD: output.c,v 1.20 2018/12/23 20:27:23 jakllsch Exp $ */
/* Id: output.c,v 1.87 2018/05/10 09:08:46 tom Exp */
#include "defs.h"
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: output.c,v 1.20 2018/12/23 20:27:23 jakllsch Exp $");
+
#define StaticOrR (rflag ? "" : "static ")
#define CountLine(fp) (!rflag || ((fp) == code_file))
