[src/trunk]: src/usr.bin/make make(1): follow naming conventions for multiple...

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

details:   https://anonhg.NetBSD.org/src/rev/042c0370d243
branches:  trunk
changeset: 1012867:042c0370d243
user:      rillig <rillig%NetBSD.org@localhost>
date:      Thu Aug 13 03:54:57 2020 +0000

description:
make(1): follow naming conventions for multiple-inclusion guards

This avoids undefined behavior.

diffstat:

 usr.bin/make/hash.h     |  8 ++++----
 usr.bin/make/job.h      |  8 ++++----
 usr.bin/make/lst.h      |  8 ++++----
 usr.bin/make/make.h     |  8 ++++----
 usr.bin/make/metachar.h |  8 ++++----
 usr.bin/make/strlist.h  |  8 ++++----
 6 files changed, 24 insertions(+), 24 deletions(-)

diffs (156 lines):

diff -r 3e8fd794b712 -r 042c0370d243 usr.bin/make/hash.h
--- a/usr.bin/make/hash.h       Thu Aug 13 03:33:56 2020 +0000
+++ b/usr.bin/make/hash.h       Thu Aug 13 03:54:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hash.h,v 1.17 2020/08/06 17:22:15 rillig Exp $ */
+/*     $NetBSD: hash.h,v 1.18 2020/08/13 03:54:57 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -78,8 +78,8 @@
  *     which maintains hash tables.
  */
 
-#ifndef        _HASH_H
-#define        _HASH_H
+#ifndef        MAKE_HASH_H
+#define        MAKE_HASH_H
 
 /*
  * The following defines one entry in the hash table.
@@ -143,4 +143,4 @@
 void Hash_ForEach(Hash_Table *, void (*)(void *, void *), void *);
 void Hash_DebugStats(Hash_Table *, const char *);
 
-#endif /* _HASH_H */
+#endif /* MAKE_HASH_H */
diff -r 3e8fd794b712 -r 042c0370d243 usr.bin/make/job.h
--- a/usr.bin/make/job.h        Thu Aug 13 03:33:56 2020 +0000
+++ b/usr.bin/make/job.h        Thu Aug 13 03:54:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: job.h,v 1.43 2020/07/03 08:13:23 rillig Exp $  */
+/*     $NetBSD: job.h,v 1.44 2020/08/13 03:54:57 rillig Exp $  */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -77,8 +77,8 @@
  * job.h --
  *     Definitions pertaining to the running of jobs in parallel mode.
  */
-#ifndef _JOB_H_
-#define _JOB_H_
+#ifndef MAKE_JOB_H
+#define MAKE_JOB_H
 
 #define TMPPAT "makeXXXXXX"            /* relative to tmpdir */
 
@@ -271,4 +271,4 @@
 void Job_SetPrefix(void);
 Boolean Job_RunTarget(const char *, const char *);
 
-#endif /* _JOB_H_ */
+#endif /* MAKE_JOB_H */
diff -r 3e8fd794b712 -r 042c0370d243 usr.bin/make/lst.h
--- a/usr.bin/make/lst.h        Thu Aug 13 03:33:56 2020 +0000
+++ b/usr.bin/make/lst.h        Thu Aug 13 03:54:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lst.h,v 1.20 2014/09/07 20:55:34 joerg Exp $   */
+/*     $NetBSD: lst.h,v 1.21 2020/08/13 03:54:57 rillig Exp $  */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -77,8 +77,8 @@
  * lst.h --
  *     Header for using the list library
  */
-#ifndef _LST_H_
-#define _LST_H_
+#ifndef MAKE_LST_H
+#define MAKE_LST_H
 
 #include       <sys/param.h>
 #include       <stdlib.h>
@@ -186,4 +186,4 @@
 /* Remove an element from head of queue */
 void           *Lst_DeQueue(Lst);
 
-#endif /* _LST_H_ */
+#endif /* MAKE_LST_H */
diff -r 3e8fd794b712 -r 042c0370d243 usr.bin/make/make.h
--- a/usr.bin/make/make.h       Thu Aug 13 03:33:56 2020 +0000
+++ b/usr.bin/make/make.h       Thu Aug 13 03:54:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.h,v 1.115 2020/08/11 18:44:52 rillig Exp $        */
+/*     $NetBSD: make.h,v 1.116 2020/08/13 03:54:57 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -77,8 +77,8 @@
  *     The global definitions for pmake
  */
 
-#ifndef _MAKE_H_
-#define _MAKE_H_
+#ifndef MAKE_MAKE_H
+#define MAKE_MAKE_H
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -524,4 +524,4 @@
 #define KILLPG(pid, sig)       killpg((pid), (sig))
 #endif
 
-#endif /* _MAKE_H_ */
+#endif /* MAKE_MAKE_H */
diff -r 3e8fd794b712 -r 042c0370d243 usr.bin/make/metachar.h
--- a/usr.bin/make/metachar.h   Thu Aug 13 03:33:56 2020 +0000
+++ b/usr.bin/make/metachar.h   Thu Aug 13 03:54:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: metachar.h,v 1.4 2015/06/21 20:26:02 christos Exp $    */
+/*     $NetBSD: metachar.h,v 1.5 2020/08/13 03:54:57 rillig Exp $      */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -28,8 +28,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef _METACHAR_H
-#define _METACHAR_H
+#ifndef MAKE_METACHAR_H
+#define MAKE_METACHAR_H
 
 #include <ctype.h>
 
@@ -58,4 +58,4 @@
        return *cmd != '\0';
 }
 
-#endif /* _METACHAR_H */
+#endif /* MAKE_METACHAR_H */
diff -r 3e8fd794b712 -r 042c0370d243 usr.bin/make/strlist.h
--- a/usr.bin/make/strlist.h    Thu Aug 13 03:33:56 2020 +0000
+++ b/usr.bin/make/strlist.h    Thu Aug 13 03:54:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: strlist.h,v 1.3 2009/01/16 21:15:34 dsl Exp $  */
+/*     $NetBSD: strlist.h,v 1.4 2020/08/13 03:54:57 rillig Exp $       */
 
 /*-
  * Copyright (c) 2008 - 2009 The NetBSD Foundation, Inc.
@@ -32,8 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _STRLIST_H
-#define _STRLIST_H
+#ifndef MAKE_STRLIST_H
+#define MAKE_STRLIST_H
 
 typedef struct {
     char          *si_str;
@@ -59,4 +59,4 @@
     if ((sl)->sl_items != NULL) \
        for (index = 0; (v = strlist_str(sl, index)) != NULL; index++)
 
-#endif /* _STRLIST_H */
+#endif /* MAKE_STRLIST_H */