From 2c7178b5fc380bb72659399ed7391a2c2c6ba43a Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Thu, 4 Apr 2002 22:25:04 +0000
Subject: [PATCH] Minor reordering of declarations to reduce diffs to
 OpenBSD/NetBSD.

---
 usr.bin/yacc/output.c  | 31 ++++++++++++++++---------------
 usr.bin/yacc/verbose.c |  4 ++--
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index 695da88b66f1..ce633f5b97f8 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -49,6 +49,22 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include "defs.h"
 
+static int nvectors;
+static int nentries;
+static short **froms;
+static short **tos;
+static short *tally;
+static short *width;
+static short *state_count;
+static short *order;
+static short *base;
+static short *pos;
+static int maxtable;
+static short *table;
+static short *check;
+static int lowzero;
+static int high;
+
 static int default_goto(int);
 static void free_itemsets(void);
 static void free_reductions(void);
@@ -77,21 +93,6 @@ static void token_actions(void);
 static int increase_maxtable(int);
 
 static const char line_format[] = "#line %d \"%s\"\n";
-static int nvectors;
-static int nentries;
-static short **froms;
-static short **tos;
-static short *tally;
-static short *width;
-static short *state_count;
-static short *order;
-static short *base;
-static short *pos;
-static int maxtable;
-static short *table;
-static short *check;
-static int lowzero;
-static int high;
 
 
 void
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 69469f0614fb..7d16d35c1db9 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -48,6 +48,8 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include "defs.h"
 
+static short *null_rules;
+
 static void log_unused(void);
 static void log_conflicts(void);
 static void print_actions(int);
@@ -59,8 +61,6 @@ static void print_reductions(action *, register int);
 static void print_shifts(action *);
 static void print_state(int);
 
-static short *null_rules;
-
 void
 verbose()
 {