Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make(1): flatten #ifdef in InitVarMachineArch

Browse Source 
Without proper indentation, that chain of nested #ifndef directives was
really hard to read.
This commit is contained in:
rillig 2020-11-13 08:21:37 +00:00
parent f8bb6cd7ea
commit cb6ce05fd8
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/make/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.456 2020/11/12 23:35:21 sjg Exp $ */
/* $NetBSD: main.c,v 1.457 2020/11/13 08:21:37 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.456 2020/11/12 23:35:21 sjg Exp $");
MAKE_RCSID("$NetBSD: main.c,v 1.457 2020/11/13 08:21:37 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@ -1022,17 +1022,13 @@ InitVarMachineArch(void)
return machine_arch_buf;
}
#else
#ifndef MACHINE_ARCH
#ifdef MAKE_MACHINE_ARCH
#elif defined(MACHINE_ARCH)
return MACHINE_ARCH;
#elif defined(MAKE_MACHINE_ARCH)
return MAKE_MACHINE_ARCH;
#else
return "unknown";
#endif
#else
return MACHINE_ARCH;
#endif
#endif
}
#ifndef NO_PWD_OVERRIDE