From 543c223a3a3f90ec32f8238ad8442d3217fa24b8 Mon Sep 17 00:00:00 2001 From: christos Date: Sun, 6 Jun 2004 05:45:04 +0000 Subject: [PATCH] Avoid EXTERN use. --- distrib/utils/sysinst/arch/i386/md.c | 6 ++++-- distrib/utils/sysinst/arch/i386/md.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/distrib/utils/sysinst/arch/i386/md.c b/distrib/utils/sysinst/arch/i386/md.c index ded4e1a66bb7..f926d2563040 100644 --- a/distrib/utils/sysinst/arch/i386/md.c +++ b/distrib/utils/sysinst/arch/i386/md.c @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.102 2004/05/15 21:53:29 dsl Exp $ */ +/* $NetBSD: md.c,v 1.103 2004/06/06 05:45:04 christos Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -70,6 +70,8 @@ static int md_read_bootcode(const char *, struct mbr_sector *); static unsigned int get_bootmodel(void); static char *md_bootxx_name(void); +const char *fdtype = "msdos"; + int md_get_info(void) @@ -298,7 +300,7 @@ md_post_newfs(void) char bootxx[8192 + 4]; char *bootxx_filename; static struct x86_boot_params boottype = - {sizeof boottype, 0, 10, 0, 9600, ""}; + {sizeof boottype, 0, 10, 0, 9600, { '\0' }}; static int conmib[] = {CTL_MACHDEP, CPU_CONSDEV}; struct termios t; dev_t condev; diff --git a/distrib/utils/sysinst/arch/i386/md.h b/distrib/utils/sysinst/arch/i386/md.h index 5c3dcd9c8edb..2f40cd22d63e 100644 --- a/distrib/utils/sysinst/arch/i386/md.h +++ b/distrib/utils/sysinst/arch/i386/md.h @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.51 2004/05/15 21:53:29 dsl Exp $ */ +/* $NetBSD: md.h,v 1.52 2004/06/06 05:45:04 christos Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -102,7 +102,7 @@ * Default fileystem type for floppy disks. * On i386, that is msdos. */ -EXTERN const char *fdtype INIT("msdos"); +const char *fdtype; #define _PATH_MBR DEFAULT_BOOTDIR "/" DEFAULT_BOOTCODE #define _PATH_BOOTSEL DEFAULT_BOOTDIR "/" DEFAULT_BOOTSELCODE