Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make make(1): remove #endif comments for very short ...
details: https://anonhg.NetBSD.org/src/rev/a988f0aa1532
branches: trunk
changeset: 954897:a988f0aa1532
user: rillig <rillig%NetBSD.org@localhost>
date: Sun Sep 13 06:15:29 2020 +0000
description:
make(1): remove #endif comments for very short blocks
diffstat:
usr.bin/make/arch.c | 8 ++++----
usr.bin/make/main.c | 8 ++++----
usr.bin/make/make.h | 6 +++---
usr.bin/make/suff.c | 10 +++++-----
4 files changed, 16 insertions(+), 16 deletions(-)
diffs (134 lines):
diff -r d06deedcf365 -r a988f0aa1532 usr.bin/make/arch.c
--- a/usr.bin/make/arch.c Sun Sep 13 06:05:56 2020 +0000
+++ b/usr.bin/make/arch.c Sun Sep 13 06:15:29 2020 +0000
@@ -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 @@
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
diff -r d06deedcf365 -r a988f0aa1532 usr.bin/make/main.c
--- a/usr.bin/make/main.c Sun Sep 13 06:05:56 2020 +0000
+++ b/usr.bin/make/main.c Sun Sep 13 06:15:29 2020 +0000
@@ -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 @@
#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 @@
#ifndef DEFMAXLOCAL
#define DEFMAXLOCAL DEFMAXJOBS
-#endif /* DEFMAXLOCAL */
+#endif
Lst create; /* Targets to be made */
time_t now; /* Time at start of make */
diff -r d06deedcf365 -r a988f0aa1532 usr.bin/make/make.h
--- a/usr.bin/make/make.h Sun Sep 13 06:05:56 2020 +0000
+++ b/usr.bin/make/make.h Sun Sep 13 06:15:29 2020 +0000
@@ -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 @@
#endif
#ifndef TRUE
#define TRUE 1
-#endif /* TRUE */
+#endif
#ifndef FALSE
#define FALSE 0
-#endif /* FALSE */
+#endif
#include "lst.h"
#include "enum.h"
diff -r d06deedcf365 -r a988f0aa1532 usr.bin/make/suff.c
--- a/usr.bin/make/suff.c Sun Sep 13 06:05:56 2020 +0000
+++ b/usr.bin/make/suff.c Sun Sep 13 06:15:29 2020 +0000
@@ -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 @@
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);
Home |
Main Index |
Thread Index |
Old Index