Rewrite so that subpipe.h can stand alone. Assume C89 or better.

diff --git a/lib/subpipe.c b/lib/subpipe.c
index 7bb520a8d28c9f62c6da2b29811cde07a48a16c9..8722bac0350757b9fc70000998dff0b87dfa52f3 100644 (file)
--- a/lib/subpipe.c
+++ b/lib/subpipe.c
@@ -1,6 +1,6 @@
 /* Subprocesses with pipes.
 
 /* Subprocesses with pipes.
 

-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -23,30 +23,16 @@
 # include <config.h>
 #endif
 
 # include <config.h>
 #endif
 

-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include "subpipe.h"

 
 #include <errno.h>
 
 #include <errno.h>

-#ifndef errno
-extern int errno;
-#endif

 
 #include <signal.h>
 #if ! defined SIGCHLD && defined SIGCLD
 # define SIGCHLD SIGCLD
 #endif
 
 
 #include <signal.h>
 #if ! defined SIGCHLD && defined SIGCLD
 # define SIGCHLD SIGCLD
 #endif
 

-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-/* The following test is to work around the gross typo in
-   systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
-   is defined to 0, not 1.  */
-#if ! EXIT_FAILURE
-# undef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
+#include <stdlib.h>

 
 #if HAVE_UNISTD_H
 # include <unistd.h>
 
 #if HAVE_UNISTD_H
 # include <unistd.h>


@@ -86,8 +72,6 @@ extern int errno;
 #include "gettext.h"
 #define _(Msgid)  gettext (Msgid)
 
 #include "gettext.h"
 #define _(Msgid)  gettext (Msgid)
 

-#include "subpipe.h"
-

 
 /* Initialize this module.  */
 
 
 /* Initialize this module.  */
 

diff --git a/lib/subpipe.h b/lib/subpipe.h
index 6f4a592fccb8c8d36e8587752e90c041d82342aa..8e1eb8b46c1ea032522407be0b5d6bc7f2668f3c 100644 (file)
--- a/lib/subpipe.h
+++ b/lib/subpipe.h
@@ -1,5 +1,5 @@
 /* Subprocesses with pipes.
 /* Subprocesses with pipes.

-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -21,6 +21,10 @@
 /* Written by Paul Eggert <eggert@twinsun.com>
    and Florian Krohm <florian@edamail.fishkill.ibm.com>.  */
 
 /* Written by Paul Eggert <eggert@twinsun.com>
    and Florian Krohm <florian@edamail.fishkill.ibm.com>.  */
 

+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+

 void init_subpipe (void);
 pid_t create_subpipe (char const * const *, int[2]);
 void reap_subpipe (pid_t, char const *);
 void init_subpipe (void);
 pid_t create_subpipe (char const * const *, int[2]);
 void reap_subpipe (pid_t, char const *);