Merge from fixincl-branch

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@25558 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 36 insertions, 36 deletions

diff --git a/gcc/fixinc/server.h b/gcc/fixinc/server.h
index aef8df7da84..0c2a0bf6093 100644
--- a/gcc/fixinc/server.h
+++ b/gcc/fixinc/server.h
@@ -1,8 +1,8 @@
 
 /*
- *  $Id: server.h,v 1.2 1998/12/16 21:19:17 law Exp $
+ *  server.c  Set up and handle communications with a server process.
  *
- *  Server Handling copyright 1992-1998 Bruce Korb
+ *  Server Handling copyright 1992-1999 The Free Software Foundation
  *
  *  Server Handling is free software.
  *  You may redistribute it and/or modify it under the terms of the
@@ -20,8 +20,9 @@
  *             59 Temple Place - Suite 330,
  *             Boston,  MA  02111-1307, USA.
  *
- * As a special exception, Bruce Korb gives permission for additional
- * uses of the text contained in his release of ServerHandler.
+ * As a special exception, The Free Software Foundation gives
+ * permission for additional uses of the text contained in his release
+ * of ServerHandler.
  *
  * The exception is that, if you link the ServerHandler library with other
  * files to produce an executable, this does not by itself cause the
@@ -32,12 +33,13 @@
  * This exception does not however invalidate any other reasons why
  * the executable file might be covered by the GNU General Public License.
  *
- * This exception applies only to the code released by Bruce Korb under
- * the name ServerHandler.  If you copy code from other sources under the
- * General Public License into a copy of ServerHandler, as the General Public
- * License permits, the exception does not apply to the code that you add
- * in this way.  To avoid misleading anyone as to the status of such
- * modified files, you must delete this exception notice from them.
+ * This exception applies only to the code released by The Free
+ * Software Foundation under the name ServerHandler.  If you copy code
+ * from other sources under the General Public License into a copy of
+ * ServerHandler, as the General Public License permits, the exception
+ * does not apply to the code that you add in this way.  To avoid
+ * misleading anyone as to the status of such modified files, you must
+ * delete this exception notice from them.
  *
  * If you write modifications of your own for ServerHandler, it is your
  * choice whether to permit this exception to apply to your modifications.
@@ -48,47 +50,45 @@
 #define FIXINC_SERVER_H
 
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 /*
  *  Dual pipe opening of a child process
  */
 
 typedef struct
-  {
-    int readFd;
-    int writeFd;
-  }
-tFdPair;
+{
+  int read_fd;
+  int write_fd;
+} t_fd_pair;
 
 typedef struct
-  {
-    FILE *pfRead;		/* parent read fp  */
-    FILE *pfWrite;		/* parent write fp */
-  }
-tpfPair;
+{
+  FILE *pf_read;		/* parent read fp  */
+  FILE *pf_write;		/* parent write fp */
+} t_pf_pair;
 
-typedef char *tpChar;
+typedef char *t_pchar;
 
-#define NOPROCESS   ((pid_t)-1)
-#define NULLPROCESS ((pid_t)0)
+#define NOPROCESS	((pid_t) -1)
+#define NULLPROCESS	((pid_t)0)
 
-#define EXIT_PANIC   99
+#define EXIT_PANIC	99
 
 typedef enum
-  {
-    BOOL_FALSE, BOOL_TRUE
-  }
-bool;
+{
+  BOOL_FALSE, BOOL_TRUE
+} bool;
 
-#define _P_(p) ()
+#define _P_(p)	()
 
-char *runShell _P_ ((const char *pzCmd));
-pid_t p2fopen _P_ ((tpfPair * pfPair, tpChar * ppArgs));
-pid_t p2open _P_ ((tFdPair * pPair, tpChar * ppArgs));
-int
-chainOpen _P_ ((int stdinFd,
-		tpChar * ppArgs,
-		pid_t * pChild));
+char *run_shell   _P_ (( const char *pzCmd));
+pid_t proc2_fopen _P_ (( t_pf_pair * p_pair, t_pchar * pp_args));
+pid_t proc2_open  _P_ (( t_fd_pair * p_pair, t_pchar * pp_args));
+int chain_open    _P_ (( int in_fd,
+                         t_pchar * pp_args,
+                         pid_t * p_child));
 
 #endif /* FIXINC_SERVER_H */