Module Name: src
Committed By: maya
Date: Wed May 31 21:15:47 UTC 2017
Modified Files:
src/usr.bin/make: buf.h dir.h sprite.h
Log Message:
The previous change might actually be less generic.
prepend by _MAKE, to be sure.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/buf.h
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/dir.h
cvs rdiff -u -r1.12 -r1.13 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/buf.h
diff -u src/usr.bin/make/buf.h:1.17 src/usr.bin/make/buf.h:1.18
--- src/usr.bin/make/buf.h:1.17 Tue Apr 24 20:26:58 2012
+++ src/usr.bin/make/buf.h Wed May 31 21:15:47 2017
@@ -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 @@ void Buf_Init(Buffer *, int);
Byte *Buf_Destroy(Buffer *, Boolean);
Byte *Buf_DestroyCompact(Buffer *);
-#endif /* _BUF_H */
+#endif /* _MAKE_BUF_H */
Index: src/usr.bin/make/dir.h
diff -u src/usr.bin/make/dir.h:1.16 src/usr.bin/make/dir.h:1.17
--- src/usr.bin/make/dir.h:1.16 Wed May 31 21:07:03 2017
+++ src/usr.bin/make/dir.h Wed May 31 21:15:47 2017
@@ -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_PrintPath(Lst);
void Dir_Destroy(void *);
void * Dir_CopyDir(void *);
-#endif /* _DIR_H */
+#endif /* _MAKE_DIR_H */
Index: src/usr.bin/make/sprite.h
diff -u src/usr.bin/make/sprite.h:1.12 src/usr.bin/make/sprite.h:1.13
--- src/usr.bin/make/sprite.h:1.12 Wed May 31 21:07:03 2017
+++ src/usr.bin/make/sprite.h Wed May 31 21:15:47 2017
@@ -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 @@ typedef int ReturnStatus;
#define SUCCESS 0x00000000
#define FAILURE 0x00000001
-#endif /* _SPRITE_H */
+#endif /* _MAKE_SPRITE_H */
