From bc9eb1f2fee55e597131ea64346dee451b35d271 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sat, 13 Apr 1996 12:53:53 +0000
Subject: [PATCH] Eliminated sloppy common-style declarations.  Now there are
 no duplicated common labels for LINT.  There are still some common
 declarations for the !KERNEL case in tcp_debug.h and spx_debug.h.  trpt
 depends on the ones in tcp_debug.h.

---
 sys/netipx/spx_debug.c  | 9 +++++++--
 sys/netipx/spx_debug.h  | 5 ++++-
 sys/netipx/spx_usrreq.c | 3 +--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sys/netipx/spx_debug.c b/sys/netipx/spx_debug.c
index 95512b0c16cd..ef4f02039205 100644
--- a/sys/netipx/spx_debug.c
+++ b/sys/netipx/spx_debug.c
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_debug.c
  *
- * $Id: spx_debug.c,v 1.4 1996/02/13 18:16:26 wollman Exp $
+ * $Id: spx_debug.c,v 1.5 1996/03/11 15:13:58 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -62,7 +62,12 @@
 #define	SANAMES
 #include <netipx/spx_debug.h>
 
-int	spxconsdebug = 0;
+#ifdef TCPDEBUG
+static int	spxconsdebug = 0;
+static struct spx_debug spx_debug[SPX_NDEBUG];
+static int	spx_debx;
+#endif
+
 /*
  * spx debug routines
  */
diff --git a/sys/netipx/spx_debug.h b/sys/netipx/spx_debug.h
index 3cf59afe4117..26b4f46aaad1 100644
--- a/sys/netipx/spx_debug.h
+++ b/sys/netipx/spx_debug.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_debug.h
  *
- * $Id: spx_debug.h,v 1.4 1995/11/04 09:03:35 julian Exp $
+ * $Id: spx_debug.h,v 1.5 1995/11/24 12:25:13 bde Exp $
  */
 
 #ifndef _NETIPX_SPX_DEBUG_H_
@@ -61,8 +61,11 @@ char	*spxnames[] =
 #endif
 
 #define	SPX_NDEBUG 100
+#ifndef KERNEL
+/* XXX common variables for broken applications. */
 struct	spx_debug spx_debug[SPX_NDEBUG];
 int	spx_debx;
+#endif
 
 #ifdef KERNEL
 extern char *prurequests[];
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 656a1fb16991..66f2f4911254 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_usrreq.h
  *
- * $Id: spx_usrreq.c,v 1.6 1995/11/24 12:01:08 bde Exp $
+ * $Id: spx_usrreq.c,v 1.7 1995/12/16 02:14:35 bde Exp $
  */
 
 #include <sys/param.h>
@@ -65,7 +65,6 @@
 
 struct spx spx_savesi;
 int traceallspxs = 0;
-extern int spxconsdebug;
 int spx_hardnosed;
 int spx_use_delack = 0;
 u_short spx_newchecks[50];