Module Name: src
Committed By: rillig
Date: Sun Sep 13 06:15:29 UTC 2020
Modified Files:
src/usr.bin/make: arch.c main.c make.h suff.c
Log Message:
make(1): remove #endif comments for very short blocks
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/usr.bin/make/arch.c
cvs rdiff -u -r1.335 -r1.336 src/usr.bin/make/main.c
cvs rdiff -u -r1.139 -r1.140 src/usr.bin/make/make.h
cvs rdiff -u -r1.153 -r1.154 src/usr.bin/make/suff.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/arch.c
diff -u src/usr.bin/make/arch.c:1.112 src/usr.bin/make/arch.c:1.113
--- src/usr.bin/make/arch.c:1.112 Sat Sep 12 18:19:50 2020
+++ src/usr.bin/make/arch.c Sun Sep 13 06:15:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.112 2020/09/12 18:19:50 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.113 2020/09/13 06:15:29 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: arch.c,v 1.112 2020/09/12 18:19:50 rillig Exp $";
+static char rcsid[] = "$NetBSD: arch.c,v 1.113 2020/09/13 06:15:29 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94";
#else
-__RCSID("$NetBSD: arch.c,v 1.112 2020/09/12 18:19:50 rillig Exp $");
+__RCSID("$NetBSD: arch.c,v 1.113 2020/09/13 06:15:29 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -1112,7 +1112,7 @@ Arch_FindLib(GNode *gn, Lst path)
Var_Set(TARGET, gn->name, gn);
#else
Var_Set(TARGET, gn->path == NULL ? gn->name : gn->path, gn);
-#endif /* LIBRARIES */
+#endif
}
/* Decide if a node with the OP_LIB attribute is out-of-date. Called from
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.335 src/usr.bin/make/main.c:1.336
--- src/usr.bin/make/main.c:1.335 Sun Sep 13 06:05:56 2020
+++ src/usr.bin/make/main.c Sun Sep 13 06:15:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.335 2020/09/13 06:05:56 rillig Exp $ */
+/* $NetBSD: main.c,v 1.336 2020/09/13 06:15:29 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.335 2020/09/13 06:05:56 rillig Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.336 2020/09/13 06:15:29 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.335 2020/09/13 06:05:56 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.336 2020/09/13 06:15:29 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -145,7 +145,7 @@ __RCSID("$NetBSD: main.c,v 1.335 2020/09
#ifndef DEFMAXLOCAL
#define DEFMAXLOCAL DEFMAXJOBS
-#endif /* DEFMAXLOCAL */
+#endif
Lst create; /* Targets to be made */
time_t now; /* Time at start of make */
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.139 src/usr.bin/make/make.h:1.140
--- src/usr.bin/make/make.h:1.139 Fri Sep 11 17:32:36 2020
+++ src/usr.bin/make/make.h Sun Sep 13 06:15:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.139 2020/09/11 17:32:36 rillig Exp $ */
+/* $NetBSD: make.h,v 1.140 2020/09/13 06:15:29 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -150,10 +150,10 @@ typedef int Boolean;
#endif
#ifndef TRUE
#define TRUE 1
-#endif /* TRUE */
+#endif
#ifndef FALSE
#define FALSE 0
-#endif /* FALSE */
+#endif
#include "lst.h"
#include "enum.h"
Index: src/usr.bin/make/suff.c
diff -u src/usr.bin/make/suff.c:1.153 src/usr.bin/make/suff.c:1.154
--- src/usr.bin/make/suff.c:1.153 Sat Sep 12 19:41:20 2020
+++ src/usr.bin/make/suff.c Sun Sep 13 06:15:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.153 2020/09/12 19:41:20 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.154 2020/09/13 06:15:29 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.153 2020/09/12 19:41:20 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.154 2020/09/13 06:15:29 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)suff.c 8.4 (Berkeley) 3/21/94";
#else
-__RCSID("$NetBSD: suff.c,v 1.153 2020/09/12 19:41:20 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.154 2020/09/13 06:15:29 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -874,12 +874,12 @@ Suff_DoPaths(void)
if (s->flags & SUFF_INCLUDE) {
Dir_Concat(inIncludes, s->searchPath);
}
-#endif /* INCLUDES */
+#endif
#ifdef LIBRARIES
if (s->flags & SUFF_LIBRARY) {
Dir_Concat(inLibs, s->searchPath);
}
-#endif /* LIBRARIES */
+#endif
Dir_Concat(s->searchPath, dirSearchPath);
} else {
Lst_Destroy(s->searchPath, Dir_Destroy);
