Module Name: src
Committed By: christos
Date: Fri Oct 18 20:19:37 UTC 2013
Modified Files:
src/usr.bin/m4: mdef.h
src/usr.bin/menuc: defs.h
src/usr.bin/msgc: defs.h
Log Message:
avoid redefinitions
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/m4/mdef.h
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/menuc/defs.h
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/msgc/defs.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/m4/mdef.h
diff -u src/usr.bin/m4/mdef.h:1.14 src/usr.bin/m4/mdef.h:1.15
--- src/usr.bin/m4/mdef.h:1.14 Sat Mar 5 11:37:50 2011
+++ src/usr.bin/m4/mdef.h Fri Oct 18 16:19:36 2013
@@ -1,5 +1,5 @@
/* $OpenBSD: mdef.h,v 1.29 2006/03/20 20:27:45 espie Exp $ */
-/* $NetBSD: mdef.h,v 1.14 2011/03/05 16:37:50 christos Exp $ */
+/* $NetBSD: mdef.h,v 1.15 2013/10/18 20:19:36 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -127,8 +127,12 @@
#define ALL 1
#define TOP 0
-#define TRUE 1
-#define FALSE 0
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
#define cycle for(;;)
/*
Index: src/usr.bin/menuc/defs.h
diff -u src/usr.bin/menuc/defs.h:1.9 src/usr.bin/menuc/defs.h:1.10
--- src/usr.bin/menuc/defs.h:1.9 Tue Mar 6 11:55:18 2012
+++ src/usr.bin/menuc/defs.h Fri Oct 18 16:19:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.9 2012/03/06 16:55:18 mbalmer Exp $ */
+/* $NetBSD: defs.h,v 1.10 2013/10/18 20:19:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,10 +50,12 @@
#define INIT(x)
#endif
-/* some constants */
-#define TRUE 1
-#define FALSE 0
-
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
/* Global variables .. to be defined in main.c, extern elsewhere. */
EXTERN char *prog_name;
Index: src/usr.bin/msgc/defs.h
diff -u src/usr.bin/msgc/defs.h:1.5 src/usr.bin/msgc/defs.h:1.6
--- src/usr.bin/msgc/defs.h:1.5 Tue Mar 6 11:26:01 2012
+++ src/usr.bin/msgc/defs.h Fri Oct 18 16:19:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.5 2012/03/06 16:26:01 mbalmer Exp $ */
+/* $NetBSD: defs.h,v 1.6 2013/10/18 20:19:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -49,9 +49,12 @@
#define INIT(x)
#endif
-/* some constants */
-#define TRUE 1
-#define FALSE 0
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
/* Global variables .. to be defined in main.c, extern elsewhere. */
