From 9ffe22f9f2f8619013775f75fbaf1db3a4dc7c70 Mon Sep 17 00:00:00 2001
From: Bruce Korb <korbb@gcc.gnu.org>
Date: Tue, 12 Oct 1999 16:02:39 +0000
Subject: [PATCH] merging from no_bogosity
From-SVN: r29924
---
gcc/fixinc/server.c | 2 +-
gcc/fixinc/server.h | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gcc/fixinc/server.c b/gcc/fixinc/server.c
index 06fa26ac6a61..1eacda78f25b 100644
--- 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 f270f36df369..12ae5afb5760 100644
--- 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));
--
GitLab