Protect the definitions of the t_bool enum

[[Split portion of a mixed commit.]]

From-SVN: r29923.2

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6053bdfcff0370d94507feb0feb777dfabd75e66..b14c84d03e975cd09d3018d88a8ba3b48c550f2c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -7,6 +7,8 @@ Fri Oct  8 19:46:03 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
 Tue Oct 12 07:38:41 1999  Bruce Korb  <autogen@linuxbox.com>
 
        * fixincl/*: Merged "no_bogosity" branch
+       * fixincl/fixlib.h: protect against doubly defining t_bool
+       * fixincl/server.h: protect against doubly defining t_bool
 
 Mon Oct 11 20:18:41 1999  Jim Wilson  <wilson@cygnus.com>
 

diff --git a/gcc/fixinc/fixlib.h b/gcc/fixinc/fixlib.h
index 3821905e26ccf9149d9ca71f7d4903b12ab852ac..3aff7556671fc01e55be2892f6d6a7f8f55dcb11 100644 (file)
--- a/gcc/fixinc/fixlib.h
+++ b/gcc/fixinc/fixlib.h
@@ -76,10 +76,13 @@ typedef int t_success;
 
 #define EXIT_PANIC     99
 
+#ifndef HAVE_T_BOOL_ENUM
+#define HAVE_T_BOOL_ENUM
 typedef enum
 {
   BOOL_FALSE, BOOL_TRUE
 } t_bool;
+#endif
 
 #define _P_(p) ()
 #endif