Use static for forward decl of static arrays instead of extern

which made newer versions of gcc complain about mixing
static and non-static decls.

ok miod@

8 files changed, 16 insertions, 16 deletions

diff --git a/sys/dev/wsfont/bold8x16-iso1.h b/sys/dev/wsfont/bold8x16-iso1.h
index 54cc7455d0a..f88a8fda3b0 100644
--- a/sys/dev/wsfont/bold8x16-iso1.h
+++ b/sys/dev/wsfont/bold8x16-iso1.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bold8x16-iso1.h,v 1.2 2008/06/26 05:42:19 ray Exp $ */
+/*	$OpenBSD: bold8x16-iso1.h,v 1.3 2009/06/21 20:30:35 jsg Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
  * This font lives in the public domain. It's based on the bold8x16 font.
  * This font is ISO 8859-1 encoded.
  */
-extern u_char bold8x16_iso1_data[];
+static u_char bold8x16_iso1_data[];
 
 struct wsdisplay_font bold8x16_iso1 = { 
 	"Boldface.iso1",		/* typeface name */
diff --git a/sys/dev/wsfont/bold8x16.h b/sys/dev/wsfont/bold8x16.h
index 1815ac7fd80..d29ec054b4d 100644
--- a/sys/dev/wsfont/bold8x16.h
+++ b/sys/dev/wsfont/bold8x16.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bold8x16.h,v 1.2 2008/06/26 05:42:19 ray Exp $ */
+/*	$OpenBSD: bold8x16.h,v 1.3 2009/06/21 20:30:35 jsg Exp $ */
 /*	 $NetBSD: bold8x16.h,v 1.4 2000/01/05 18:44:22 ad Exp $ */
 
 /*-
@@ -34,7 +34,7 @@
  * This font lives in the public domain. It it a PC font, IBM encoding,
  * which was designed for use with syscons.
  */
-extern u_char bold8x16_data[];
+static u_char bold8x16_data[];
 
 struct wsdisplay_font bold8x16 = { 
 	"Boldface",			/* typeface name */
diff --git a/sys/dev/wsfont/gallant12x22.h b/sys/dev/wsfont/gallant12x22.h
index f2354119e63..5d0dc311e8c 100644
--- a/sys/dev/wsfont/gallant12x22.h
+++ b/sys/dev/wsfont/gallant12x22.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gallant12x22.h,v 1.3 2003/06/02 23:28:04 millert Exp $ */
+/*	$OpenBSD: gallant12x22.h,v 1.4 2009/06/21 20:30:35 jsg Exp $ */
 /* 	$NetBSD: gallant12x22.h,v 1.2 1999/05/18 21:51:58 ad Exp $ */
 
 /*
@@ -36,7 +36,7 @@
  * Derived from: @(#)gallant19.h	8.1 (Berkeley) 6/11/93
  */
  
-extern u_char gallant12x22_data[];
+static u_char gallant12x22_data[];
 
 struct wsdisplay_font gallant12x22 = { 
 	"Gallant",			/* typeface name */
diff --git a/sys/dev/wsfont/lucida16x29.h b/sys/dev/wsfont/lucida16x29.h
index 6cba601d96d..3c241d2f23c 100644
--- a/sys/dev/wsfont/lucida16x29.h
+++ b/sys/dev/wsfont/lucida16x29.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lucida16x29.h,v 1.1 2001/03/18 04:30:23 nate Exp $ */
+/*	$OpenBSD: lucida16x29.h,v 1.2 2009/06/21 20:30:35 jsg Exp $ */
 /*	 $NetBSD: lucida16x29.h,v 1.3 1999/05/18 21:51:58 ad Exp $ */
 
 /*
@@ -64,7 +64,7 @@ This is the LEGAL NOTICE pertaining to the Lucida fonts from Bigelow & Holmes:
 
 */
 
-extern u_char lucida16x29_data[];
+static u_char lucida16x29_data[];
 
 struct wsdisplay_font lucida16x29 = {
 	"Lucida",			/* typeface name */
diff --git a/sys/dev/wsfont/omron12x20.h b/sys/dev/wsfont/omron12x20.h
index b991639cb11..5d1f57f711f 100644
--- a/sys/dev/wsfont/omron12x20.h
+++ b/sys/dev/wsfont/omron12x20.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: omron12x20.h,v 1.2 2003/06/02 23:28:04 millert Exp $ */
+/*	$OpenBSD: omron12x20.h,v 1.3 2009/06/21 20:30:35 jsg Exp $ */
 /*	$NetBSD$	*/
 /*
  * Copyright (c) 1992 OMRON Corporation.
@@ -41,7 +41,7 @@
  *	This file is generated from sys/luna68k/font/font.c in 4.4BSD-Lite2.
  */
 
-extern u_char omron12x20_data[];
+static u_char omron12x20_data[];
 
 struct wsdisplay_font omron12x20 = {
 	"omron12x20",			/* typeface name */
diff --git a/sys/dev/wsfont/qvss8x15.h b/sys/dev/wsfont/qvss8x15.h
index 8f4d931b440..09cdc9a05e4 100644
--- a/sys/dev/wsfont/qvss8x15.h
+++ b/sys/dev/wsfont/qvss8x15.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qvss8x15.h,v 1.3 2006/07/24 20:31:45 miod Exp $ */
+/*	$OpenBSD: qvss8x15.h,v 1.4 2009/06/21 20:30:35 jsg Exp $ */
 /* 	$NetBSD: qvss8x15.h,v 1.3 1999/05/18 21:51:58 ad Exp $ */
 
 /*-
@@ -69,7 +69,7 @@
  *									*
  ************************************************************************/
 
-extern u_char qvss8x15_data[];
+static u_char qvss8x15_data[];
 
 struct wsdisplay_font qvss8x15 = { 
 	"QVSS",				/* typeface name */
diff --git a/sys/dev/wsfont/vt220l8x10.h b/sys/dev/wsfont/vt220l8x10.h
index 0993dd9d66e..e6f2b81a093 100644
--- a/sys/dev/wsfont/vt220l8x10.h
+++ b/sys/dev/wsfont/vt220l8x10.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vt220l8x10.h,v 1.1 2001/03/18 04:30:24 nate Exp $ */
+/*	$OpenBSD: vt220l8x10.h,v 1.2 2009/06/21 20:30:35 jsg Exp $ */
 /* 	$NetBSD: vt220l8x10.h,v 1.3 2000/01/05 18:44:25 ad Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
  * Translated into a wsfont form by Shin Takemura in Nov 2, 1999.
  */
 
-extern u_char vt220l8x10_data[];
+static u_char vt220l8x10_data[];
 
 struct wsdisplay_font vt220l8x10 = {
 	"vt220l",			/* typeface name */
diff --git a/sys/dev/wsfont/vt220l8x8.h b/sys/dev/wsfont/vt220l8x8.h
index e5be40ed6d2..a7e58625e8c 100644
--- a/sys/dev/wsfont/vt220l8x8.h
+++ b/sys/dev/wsfont/vt220l8x8.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vt220l8x8.h,v 1.1 2001/03/18 04:30:24 nate Exp $ */
+/*	$OpenBSD: vt220l8x8.h,v 1.2 2009/06/21 20:30:35 jsg Exp $ */
 /* 	$NetBSD: vt220l8x8.h,v 1.3 2000/01/05 18:44:25 ad Exp $	*/
 
 /*
@@ -37,7 +37,7 @@
  * Translated into a wsfont form by Shin Takemura in Nov 2, 1999.
  */
 
-extern u_char vt220l8x8_data[];
+static u_char vt220l8x8_data[];
 
 struct wsdisplay_font vt220l8x8 = {
 	"vt220l",			/* typeface name */