Try to make this compile on both alpha and i386
This commit is contained in:
parent
6722fe2d35
commit
31ae054ece
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=38474
@ -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"; */
|
/* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */
|
||||||
#endif
|
#endif
|
||||||
static const char rcsid[] =
|
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 */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -548,7 +548,6 @@ makebootarea(boot, dp, f)
|
|||||||
register struct disklabel *dp;
|
register struct disklabel *dp;
|
||||||
int f;
|
int f;
|
||||||
{
|
{
|
||||||
struct disklabel *lp;
|
|
||||||
register char *p;
|
register char *p;
|
||||||
int b;
|
int b;
|
||||||
#if NUMBOOT > 0
|
#if NUMBOOT > 0
|
||||||
@ -560,6 +559,7 @@ makebootarea(boot, dp, f)
|
|||||||
int n;
|
int n;
|
||||||
#endif
|
#endif
|
||||||
#ifdef __i386__
|
#ifdef __i386__
|
||||||
|
struct disklabel *lp;
|
||||||
char *tmpbuf;
|
char *tmpbuf;
|
||||||
int i, found;
|
int i, found;
|
||||||
#endif
|
#endif
|
||||||
|
@ -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"; */
|
/* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */
|
||||||
#endif
|
#endif
|
||||||
static const char rcsid[] =
|
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 */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -548,7 +548,6 @@ makebootarea(boot, dp, f)
|
|||||||
register struct disklabel *dp;
|
register struct disklabel *dp;
|
||||||
int f;
|
int f;
|
||||||
{
|
{
|
||||||
struct disklabel *lp;
|
|
||||||
register char *p;
|
register char *p;
|
||||||
int b;
|
int b;
|
||||||
#if NUMBOOT > 0
|
#if NUMBOOT > 0
|
||||||
@ -560,6 +559,7 @@ makebootarea(boot, dp, f)
|
|||||||
int n;
|
int n;
|
||||||
#endif
|
#endif
|
||||||
#ifdef __i386__
|
#ifdef __i386__
|
||||||
|
struct disklabel *lp;
|
||||||
char *tmpbuf;
|
char *tmpbuf;
|
||||||
int i, found;
|
int i, found;
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user