Module Name:    src
Committed By:   maya
Date:           Wed May 31 21:07:03 UTC 2017

Modified Files:
        src/usr.bin/make: dir.h hash.h sprite.h

Log Message:
Use less generic include guards


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/dir.h
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/hash.h src/usr.bin/make/sprite.h

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/dir.h
diff -u src/usr.bin/make/dir.h:1.15 src/usr.bin/make/dir.h:1.16
--- src/usr.bin/make/dir.h:1.15	Sat Apr  7 18:29:08 2012
+++ src/usr.bin/make/dir.h	Wed May 31 21:07:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: dir.h,v 1.15 2012/04/07 18:29:08 christos Exp $	*/
+/*	$NetBSD: dir.h,v 1.16 2017/05/31 21:07:03 maya Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -75,8 +75,8 @@
 /* dir.h --
  */
 
-#ifndef	_DIR
-#define	_DIR
+#ifndef	_DIR_H
+#define	_DIR_H
 
 typedef struct Path {
     char         *name;	    	/* Name of directory */
@@ -105,4 +105,4 @@ void Dir_PrintPath(Lst);
 void Dir_Destroy(void *);
 void * Dir_CopyDir(void *);
 
-#endif /* _DIR */
+#endif /* _DIR_H */

Index: src/usr.bin/make/hash.h
diff -u src/usr.bin/make/hash.h:1.11 src/usr.bin/make/hash.h:1.12
--- src/usr.bin/make/hash.h:1.11	Tue Jun  7 00:40:00 2016
+++ src/usr.bin/make/hash.h	Wed May 31 21:07:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash.h,v 1.11 2016/06/07 00:40:00 sjg Exp $	*/
+/*	$NetBSD: hash.h,v 1.12 2017/05/31 21:07:03 maya Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -78,8 +78,8 @@
  * 	which maintains hash tables.
  */
 
-#ifndef	_HASH
-#define	_HASH
+#ifndef	_HASH_H
+#define	_HASH_H
 
 /*
  * The following defines one entry in the hash table.
@@ -146,4 +146,4 @@ void Hash_DeleteEntry(Hash_Table *, Hash
 Hash_Entry *Hash_EnumFirst(Hash_Table *, Hash_Search *);
 Hash_Entry *Hash_EnumNext(Hash_Search *);
 
-#endif /* _HASH */
+#endif /* _HASH_H */
Index: src/usr.bin/make/sprite.h
diff -u src/usr.bin/make/sprite.h:1.11 src/usr.bin/make/sprite.h:1.12
--- src/usr.bin/make/sprite.h:1.11	Fri Jan 23 21:26:30 2009
+++ src/usr.bin/make/sprite.h	Wed May 31 21:07:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: sprite.h,v 1.11 2009/01/23 21:26:30 dsl Exp $	*/
+/*	$NetBSD: sprite.h,v 1.12 2017/05/31 21:07:03 maya Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -78,8 +78,8 @@
  * Common constants and type declarations for Sprite.
  */
 
-#ifndef _SPRITE
-#define _SPRITE
+#ifndef _SPRITE_H
+#define _SPRITE_H
 
 
 /*
@@ -113,4 +113,4 @@ typedef int  ReturnStatus;
 #define	SUCCESS			0x00000000
 #define	FAILURE			0x00000001
 
-#endif /* _SPRITE */
+#endif /* _SPRITE_H */

Reply via email to