[src/trunk]: src/usr.bin/make The previous change might actually be less gene...

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

details:   https://anonhg.NetBSD.org/src/rev/ece46ee6a7a2
branches:  trunk
changeset: 824310:ece46ee6a7a2
user:      maya <maya%NetBSD.org@localhost>
date:      Wed May 31 21:15:47 2017 +0000

description:
The previous change might actually be less generic.
prepend by _MAKE, to be sure.

diffstat:

 usr.bin/make/buf.h    |  8 ++++----
 usr.bin/make/dir.h    |  8 ++++----
 usr.bin/make/sprite.h |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diffs (78 lines):

diff -r 4239eb0b4171 -r ece46ee6a7a2 usr.bin/make/buf.h
--- a/usr.bin/make/buf.h        Wed May 31 21:07:03 2017 +0000
+++ b/usr.bin/make/buf.h        Wed May 31 21:15:47 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: buf.h,v 1.17 2012/04/24 20:26:58 sjg Exp $     */
+/*     $NetBSD: buf.h,v 1.18 2017/05/31 21:15:47 maya Exp $    */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -77,8 +77,8 @@
  *     Header for users of the buf library.
  */
 
-#ifndef _BUF_H
-#define _BUF_H
+#ifndef _MAKE_BUF_H
+#define _MAKE_BUF_H
 
 typedef char Byte;
 
@@ -116,4 +116,4 @@
 Byte *Buf_Destroy(Buffer *, Boolean);
 Byte *Buf_DestroyCompact(Buffer *);
 
-#endif /* _BUF_H */
+#endif /* _MAKE_BUF_H */
diff -r 4239eb0b4171 -r ece46ee6a7a2 usr.bin/make/dir.h
--- a/usr.bin/make/dir.h        Wed May 31 21:07:03 2017 +0000
+++ b/usr.bin/make/dir.h        Wed May 31 21:15:47 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dir.h,v 1.16 2017/05/31 21:07:03 maya Exp $    */
+/*     $NetBSD: dir.h,v 1.17 2017/05/31 21:15:47 maya Exp $    */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -75,8 +75,8 @@
 /* dir.h --
  */
 
-#ifndef        _DIR_H
-#define        _DIR_H
+#ifndef        _MAKE_DIR_H
+#define        _MAKE_DIR_H
 
 typedef struct Path {
     char         *name;                /* Name of directory */
@@ -105,4 +105,4 @@
 void Dir_Destroy(void *);
 void * Dir_CopyDir(void *);
 
-#endif /* _DIR_H */
+#endif /* _MAKE_DIR_H */
diff -r 4239eb0b4171 -r ece46ee6a7a2 usr.bin/make/sprite.h
--- a/usr.bin/make/sprite.h     Wed May 31 21:07:03 2017 +0000
+++ b/usr.bin/make/sprite.h     Wed May 31 21:15:47 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sprite.h,v 1.12 2017/05/31 21:07:03 maya Exp $ */
+/*     $NetBSD: sprite.h,v 1.13 2017/05/31 21:15:47 maya Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -78,8 +78,8 @@
  * Common constants and type declarations for Sprite.
  */
 
-#ifndef _SPRITE_H
-#define _SPRITE_H
+#ifndef _MAKE_SPRITE_H
+#define _MAKE_SPRITE_H
 
 
 /*
@@ -113,4 +113,4 @@
 #define        SUCCESS                 0x00000000
 #define        FAILURE                 0x00000001
 
-#endif /* _SPRITE_H */
+#endif /* _MAKE_SPRITE_H */