merging from no_bogosity

From-SVN: r29924

diff --git a/gcc/fixinc/server.c b/gcc/fixinc/server.c
index 06fa26ac6a6103d8360a738740b53ac2297873a3..1eacda78f25b0c9df25a916a5e7d7aa778cd5d8e 100644 (file)
--- a/gcc/fixinc/server.c
+++ b/gcc/fixinc/server.c
@@ -83,7 +83,7 @@
 # define volatile
 #endif
 
-STATIC volatile bool read_pipe_timeout;
+STATIC volatile t_bool read_pipe_timeout;
 
 static t_pchar def_args[] =
 { (char *) NULL, (char *) NULL };

diff --git a/gcc/fixinc/server.h b/gcc/fixinc/server.h
index f270f36df369c8b2e22900e55889e377ec5e233a..12ae5afb576005c2ea4c7cc719f0a4877dc93a7c 100644 (file)
--- a/gcc/fixinc/server.h
+++ b/gcc/fixinc/server.h
@@ -72,17 +72,22 @@ typedef struct
 
 typedef char *t_pchar;
 
+#ifndef NOPROCESS
 #define NOPROCESS      ((pid_t) -1)
 #define NULLPROCESS    ((pid_t)0)
 
 #define EXIT_PANIC     99
 
+#ifndef HAVE_T_BOOL_ENUM
+#define HAVE_T_BOOL_ENUM
 typedef enum
 {
   BOOL_FALSE, BOOL_TRUE
-} bool;
+} t_bool;
+#endif
 
 #define _P_(p) ()
+#endif
 
 char *run_shell   _P_ (( const char *pzCmd));
 pid_t proc2_fopen _P_ (( t_pf_pair * p_pair, t_pchar * pp_args));