From f8bc613916612ca12f0a2ab35e28b588c6dad681 Mon Sep 17 00:00:00 2001
From: Robert Lipe <robertlipe@usa.net>
Date: Sun, 30 May 1999 13:45:17 +0000
Subject: [PATCH] fixincl.c: Replace local include scheme with #includes of
 gansidecl.h and system.h.

        * fixincl.c: Replace local include scheme with #includes of
        gansidecl.h and system.h.
        * procopen.c:  Likewise.
        * server.c:  Likewise.

From-SVN: r27251
---
 gcc/ChangeLog         |  7 ++++
 gcc/fixinc/fixincl.c  | 76 ++-----------------------------------------
 gcc/fixinc/procopen.c | 13 ++------
 gcc/fixinc/server.c   | 12 ++-----
 4 files changed, 13 insertions(+), 95 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0dfab76f183b..b12c6b4f3663 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+Sun May 30 14:43:37 1999  Robert Lipe  <robertlipe@usa.net>
+
+	* fixincl.c: Replace local include scheme with #includes of 
+	gansidecl.h and system.h.
+	* procopen.c:  Likewise.
+	* server.c:  Likewise.
+
 Sun May 30 14:18:40 1999  Jeffrey A Law  (law@cygnus.com)
 
 	* function.h (cleanup_label, frame_offset): Declare.
diff --git a/gcc/fixinc/fixincl.c b/gcc/fixinc/fixincl.c
index d8b41cdbd2b6..f8c87ff79ac0 100644
--- a/gcc/fixinc/fixincl.c
+++ b/gcc/fixinc/fixincl.c
@@ -23,81 +23,9 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #include "auto-host.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#else
- /* These definitions really belong in ../system.h, which we should be
-    using, (and some of them are), but for now they're here... */
-# ifndef WIFSIGNALED
-#  define WIFSIGNALED(S) (((S) & 0xff) != 0 && ((S) & 0xff) != 0x7f)
-# endif
-# ifndef WTERMSIG
-#  define WTERMSIG(S) ((S) & 0x7f)
-# endif
-# ifndef WIFEXITED
-#  define WIFEXITED(S) (((S) & 0xff) == 0)
-# endif
-# ifndef WEXITSTATUS
-#  define WEXITSTATUS(S) (((S) & 0xff00) >> 8)
-# endif
-# ifndef WIFSTOPPED
-#  define WIFSTOPPED(status)	((status) & 0100)
-# endif
-# ifndef WSTOPSIG
-#  define WSTOPSIG(status) \
-	((int)(WIFSTOPPED(status) ? (((status) >> 8) & 0177) : -1))
-# endif
-#endif
+#include "gansidecl.h"
+#include "system.h"
 #include <signal.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <ctype.h>
-
-/* These definitions really belong in ../system.h, which we should be
-   using, but for now they're here... */
-#ifndef S_IRUSR			
-# ifdef S_IREAD
-#  define S_IRUSR  S_IREAD	/* read permission, owner */
-#  define S_IWUSR  S_IWRITE	/* write permission, owner */
-#  define S_IXUSR  S_IEXEC	/* execute/search permission, owner */
-# else
-#  define S_IRUSR  0000400	/* read permission, owner */
-#  define S_IWUSR  0000200	/* write permission, owner */
-#  define S_IXUSR  0000100	/* execute/search permission, owner */
-# endif
-#endif
-#ifndef S_IRGRP
-# define S_IRGRP  0000040	/* read permission, group */
-# define S_IWGRP  0000020	/* write permission, group */
-# define S_IXGRP  0000010	/* execute/search permission, group */
-#endif
-#ifndef S_IROTH
-# define S_IROTH  0000004	/* read permission, other */
-# define S_IWOTH  0000002	/* write permission, other */
-# define S_IXOTH  0000001	/* execute/search permission, group */
-#endif
-#ifndef S_IRWXU
-# define S_IRWXU  0000700	/* read, write, execute permission, owner */
-# define S_IRWXG  0000070	/* read, write, execute permission, group */
-# define S_IRWXO  0000007	/* read, write, execute permission, other */
-#endif
-
-/* Test if something is a normal file.  */
-#ifndef S_ISREG
-#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
 
 #include "gnu-regex.h"
 #include "server.h"
diff --git a/gcc/fixinc/procopen.c b/gcc/fixinc/procopen.c
index 00f13b7ae972..086a21e18e4a 100644
--- a/gcc/fixinc/procopen.c
+++ b/gcc/fixinc/procopen.c
@@ -46,17 +46,8 @@
  * If you do not wish that, delete this exception notice.
  */
 #include "auto-host.h"
-
-#include <sys/types.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/param.h>
+#include "gansidecl.h"
+#include "system.h"
 
 #include "server.h"
 
diff --git a/gcc/fixinc/server.c b/gcc/fixinc/server.c
index 4af40e5eb961..40662c46572a 100644
--- a/gcc/fixinc/server.c
+++ b/gcc/fixinc/server.c
@@ -46,17 +46,9 @@
  * If you do not wish that, delete this exception notice.
  */
 #include "auto-host.h"
-
-#include <sys/types.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <errno.h>
+#include "gansidecl.h"
+#include "system.h"
 #include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/param.h>
 
 #include "server.h"