[src/trunk]: src/usr.bin avoid redefinitions

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

details:   https://anonhg.NetBSD.org/src/rev/ab51b2141edc
branches:  trunk
changeset: 790636:ab51b2141edc
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 18 20:19:36 2013 +0000

description:
avoid redefinitions

diffstat:

 usr.bin/m4/mdef.h    |  10 +++++++---
 usr.bin/menuc/defs.h |  12 +++++++-----
 usr.bin/msgc/defs.h  |  11 +++++++----
 3 files changed, 21 insertions(+), 12 deletions(-)

diffs (76 lines):

diff -r 8c79e0d912e4 -r ab51b2141edc usr.bin/m4/mdef.h
--- a/usr.bin/m4/mdef.h Fri Oct 18 20:19:03 2013 +0000
+++ b/usr.bin/m4/mdef.h Fri Oct 18 20:19:36 2013 +0000
@@ -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(;;)
 
 /*
diff -r 8c79e0d912e4 -r ab51b2141edc usr.bin/menuc/defs.h
--- a/usr.bin/menuc/defs.h      Fri Oct 18 20:19:03 2013 +0000
+++ b/usr.bin/menuc/defs.h      Fri Oct 18 20:19:36 2013 +0000
@@ -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;
diff -r 8c79e0d912e4 -r ab51b2141edc usr.bin/msgc/defs.h
--- a/usr.bin/msgc/defs.h       Fri Oct 18 20:19:03 2013 +0000
+++ b/usr.bin/msgc/defs.h       Fri Oct 18 20:19:36 2013 +0000
@@ -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. */