summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkan <kan@FreeBSD.org>2007-04-06 20:50:24 +0000
committerkan <kan@FreeBSD.org>2007-04-06 20:50:24 +0000
commitaf15ae34e20473e7f769fbde2bd73ff0d0fe9a82 (patch)
tree1eab33349d4f925c2cb77f01f21ceaa4761514b8
parentdd704902afb398e42ae879b94546d0099a3b8812 (diff)
downloadFreeBSD-src-af15ae34e20473e7f769fbde2bd73ff0d0fe9a82.zip
FreeBSD-src-af15ae34e20473e7f769fbde2bd73ff0d0fe9a82.tar.gz
pc98 boot2 is compiled with _KERNEL defined, and that makes non-static
bootinfo variable declaration visible. It conflicts with static declaration in this file. Declare variable as globally visible in order to resolve the conflict.
-rw-r--r--sys/boot/pc98/boot2/boot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/pc98/boot2/boot.c b/sys/boot/pc98/boot2/boot.c
index feccc7e..f350b91 100644
--- a/sys/boot/pc98/boot2/boot.c
+++ b/sys/boot/pc98/boot2/boot.c
@@ -70,7 +70,7 @@ static char kernel_config[KERNEL_CONFIG_SIZE];
static char kernel_config_namebuf[NAMEBUF_LEN + sizeof "config"];
static char linebuf[NAMEBUF_LEN];
static char namebuf[NAMEBUF_LEN];
-static struct bootinfo bootinfo;
+struct bootinfo bootinfo;
int loadflags;
static void getbootdev(char *ptr, int *howto);
OpenPOWER on IntegriCloud