[src/trunk]: src/usr.sbin/sysinst In non-MBR specific files, #ifdef all tests...

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

details:   https://anonhg.NetBSD.org/src/rev/850bc2ee753e
branches:  trunk
changeset: 460507:850bc2ee753e
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Oct 26 07:32:52 2019 +0000

description:
In non-MBR specific files, #ifdef all tests for MBR for architectures
that do not even compile in MBR support.

diffstat:

 usr.sbin/sysinst/part_edit.c  |  4 +++-
 usr.sbin/sysinst/partitions.c |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r 734b73f968fa -r 850bc2ee753e usr.sbin/sysinst/part_edit.c
--- a/usr.sbin/sysinst/part_edit.c      Sat Oct 26 07:31:39 2019 +0000
+++ b/usr.sbin/sysinst/part_edit.c      Sat Oct 26 07:32:52 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: part_edit.c,v 1.9 2019/10/25 12:24:34 martin Exp $ */
+/*     $NetBSD: part_edit.c,v 1.10 2019/10/26 07:32:52 martin Exp $ */
 
 /*
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -1218,8 +1218,10 @@
                if (bootable && p->have_boot_support != NULL &&
                    !p->have_boot_support(dev->diskdev))
                        continue;
+#ifdef HAVE_MBR
                if (dev->no_mbr && p->name == MSG_parttype_mbr)
                        continue;
+#endif
                if (p->size_limit && dev->dlsize > p->size_limit) {
                        char buf[255], hum_lim[5];
 
diff -r 734b73f968fa -r 850bc2ee753e usr.sbin/sysinst/partitions.c
--- a/usr.sbin/sysinst/partitions.c     Sat Oct 26 07:31:39 2019 +0000
+++ b/usr.sbin/sysinst/partitions.c     Sat Oct 26 07:32:52 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: partitions.c,v 1.3 2019/10/25 12:49:58 martin Exp $    */
+/*     $NetBSD: partitions.c,v 1.4 2019/10/26 07:32:52 martin Exp $    */
 
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
@@ -53,8 +53,10 @@
                return NULL;
 
        for (ps = available_part_schemes; *ps; ps++) {
+#ifdef HAVE_MBR
                if (no_mbr && (*ps)->name == MSG_parttype_mbr)
                        continue;
+#endif
                struct disk_partitions *parts =
                    (*ps)->read_from_disk(dev, 0, disk_size, *ps);
                if (parts)