[src/trunk]: src/distrib/utils/sysinst make this build on non-emips again

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/96ca06409e06
branches:  trunk
changeset: 761392:96ca06409e06
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Jan 26 10:58:19 2011 +0000

description:
make this build on non-emips again

diffstat:

 distrib/utils/sysinst/arch/emips/md.h |  6 +++++-
 distrib/utils/sysinst/defs.h          |  7 ++++++-
 distrib/utils/sysinst/main.c          |  6 +-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r 8cc3a9b8ff9d -r 96ca06409e06 distrib/utils/sysinst/arch/emips/md.h
--- a/distrib/utils/sysinst/arch/emips/md.h     Wed Jan 26 09:56:51 2011 +0000
+++ b/distrib/utils/sysinst/arch/emips/md.h     Wed Jan 26 10:58:19 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.1 2011/01/26 01:18:46 pooka Exp $     */
+/*     $NetBSD: md.h,v 1.2 2011/01/26 10:58:20 pooka Exp $     */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -87,4 +87,8 @@
 #define MD_SETS_VALID  SET_KERNEL, SET_SYSTEM, SET_X11_NOSERVERS
 
 /* default install CD device is ace1a */
+/* XXX: not pretty */
+#ifdef CD_NAME
+#undef CD_NAME
+#endif
 #define CD_NAME "ace1a"
diff -r 8cc3a9b8ff9d -r 96ca06409e06 distrib/utils/sysinst/defs.h
--- a/distrib/utils/sysinst/defs.h      Wed Jan 26 09:56:51 2011 +0000
+++ b/distrib/utils/sysinst/defs.h      Wed Jan 26 10:58:19 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.149 2010/12/04 14:57:56 jmmv Exp $  */
+/*     $NetBSD: defs.h,v 1.150 2011/01/26 10:58:19 pooka Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -160,6 +160,11 @@
 #define PI_ISBSDFS(p) ((p)->pi_fstype == FS_BSDLFS || \
                       (p)->pi_fstype == FS_BSDFFS)
 
+/* non-standard cd0 driver */
+#ifndef CD_NAME
+#define CD_NAME "cd0a"
+#endif
+
 /* Types */
 typedef struct distinfo {
        const char      *name;
diff -r 8cc3a9b8ff9d -r 96ca06409e06 distrib/utils/sysinst/main.c
--- a/distrib/utils/sysinst/main.c      Wed Jan 26 09:56:51 2011 +0000
+++ b/distrib/utils/sysinst/main.c      Wed Jan 26 10:58:19 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.55 2011/01/26 01:18:46 pooka Exp $  */
+/*     $NetBSD: main.c,v 1.56 2011/01/26 10:58:19 pooka Exp $  */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -82,10 +82,6 @@
        int size;
 };
 
-#ifndef CD_NAME
-#define CD_NAME "cd0a"
-#endif
-
 static const struct f_arg fflagopts[] = {
        {"release", REL, rel, sizeof rel},
        {"machine", MACH, machine, sizeof machine},