From 31ae054ece73a09a2a9f123dd3ab98af672bb75d Mon Sep 17 00:00:00 2001
From: Gary Palmer <gpalmer@FreeBSD.org>
Date: Fri, 21 Aug 1998 23:44:16 +0000
Subject: [PATCH] Try to make this compile on both alpha and i386

---
 sbin/bsdlabel/bsdlabel.c   | 4 ++--
 sbin/disklabel/disklabel.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index ad6f11b33fca..9f48711c4aaf 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 1/7/94";
 /* from static char sccsid[] = "@(#)disklabel.c	1.2 (Symmetric) 11/28/85"; */
 #endif
 static const char rcsid[] =
-	"$Id: disklabel.c,v 1.18 1998/08/17 07:43:54 dfr Exp $";
+	"$Id: disklabel.c,v 1.19 1998/08/17 21:13:57 bde Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -548,7 +548,6 @@ makebootarea(boot, dp, f)
 	register struct disklabel *dp;
 	int f;
 {
-	struct disklabel *lp;
 	register char *p;
 	int b;
 #if NUMBOOT > 0
@@ -560,6 +559,7 @@ makebootarea(boot, dp, f)
 	int n;
 #endif
 #ifdef __i386__
+	struct disklabel *lp;
 	char *tmpbuf;
 	int i, found;
 #endif
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index ad6f11b33fca..9f48711c4aaf 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 1/7/94";
 /* from static char sccsid[] = "@(#)disklabel.c	1.2 (Symmetric) 11/28/85"; */
 #endif
 static const char rcsid[] =
-	"$Id: disklabel.c,v 1.18 1998/08/17 07:43:54 dfr Exp $";
+	"$Id: disklabel.c,v 1.19 1998/08/17 21:13:57 bde Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -548,7 +548,6 @@ makebootarea(boot, dp, f)
 	register struct disklabel *dp;
 	int f;
 {
-	struct disklabel *lp;
 	register char *p;
 	int b;
 #if NUMBOOT > 0
@@ -560,6 +559,7 @@ makebootarea(boot, dp, f)
 	int n;
 #endif
 #ifdef __i386__
+	struct disklabel *lp;
 	char *tmpbuf;
 	int i, found;
 #endif