Module Name: src
Committed By: rillig
Date: Fri Nov 13 19:45:24 UTC 2020
Modified Files:
src/usr.bin/make: main.c
Log Message:
make(1): clean up preprocessor macros in InitVarMachine
To generate a diff of this commit:
cvs rdiff -u -r1.457 -r1.458 src/usr.bin/make/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.457 src/usr.bin/make/main.c:1.458
--- src/usr.bin/make/main.c:1.457 Fri Nov 13 08:21:37 2020
+++ src/usr.bin/make/main.c Fri Nov 13 19:45:24 2020
@@ -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 @@ InitVarMachine(const struct utsname *uts
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 *
