[src/trunk]: src/usr.bin/make make(1): clean up preprocessor macros in InitVa...

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

details:   https://anonhg.NetBSD.org/src/rev/dd13f4e89894
branches:  trunk
changeset: 1016251:dd13f4e89894
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Nov 13 19:45:24 2020 +0000

description:
make(1): clean up preprocessor macros in InitVarMachine

diffstat:

 usr.bin/make/main.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 68e6b66baae7 -r dd13f4e89894 usr.bin/make/main.c
--- a/usr.bin/make/main.c       Fri Nov 13 17:39:06 2020 +0000
+++ b/usr.bin/make/main.c       Fri Nov 13 19:45:24 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.457 2020/11/13 08:21:37 rillig Exp $        */
+/*     $NetBSD: main.c,v 1.458 2020/11/13 19:45:24 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
 #include "trace.h"
 
 /*     "@(#)main.c     8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.457 2020/11/13 08:21:37 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.458 2020/11/13 19:45:24 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
            "The Regents of the University of California.  "
@@ -988,15 +988,13 @@
        if (machine != NULL)
                return machine;
 
-#ifdef MAKE_NATIVE
+#if defined(MAKE_NATIVE)
        return utsname->machine;
-#else
-#ifdef MAKE_MACHINE
+#elif defined(MAKE_MACHINE)
        return MAKE_MACHINE;
 #else
        return "unknown";
 #endif
-#endif
 }
 
 static const char *