(bsd/sys/wait.h): Undo previous change.

From-SVN: r5919

1 files changed, 4 insertions, 21 deletions

diff --git a/gcc/fixincludes b/gcc/fixincludes
index c1e78f6..4b4e7895 100755
--- a/gcc/fixincludes
+++ b/gcc/fixincludes
@@ -1001,7 +1001,10 @@ if [ -r ${LIB}/$file ]; then
   fi
 fi
 
-# NeXT defines 'int wait(union wait*)', which conflicts with Posix.1.
+# NeXT 2.0 defines 'int wait(union wait*)', which conflicts with Posix.1.
+# Note that version 3 of the NeXT system has wait.h in a different directory,
+# so that this code won't do anything.  But wait.h in version 3 has a
+# conditional, so it doesn't need this fix.  So everything is okay.
 file=sys/wait.h
 if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
   cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
@@ -1018,26 +1021,6 @@ if [ -r ${LIB}/$file ] \
   fi
 fi
 
-# Some versions of NeXTStep apparently have the file fixed above in
-# bsd/sys/wait.h, instead.
-file=bsd/sys/wait.h
-if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
-  mkdir ${LIB}/bsd 2>/dev/null
-  mkdir ${LIB}/bsd/sys 2>/dev/null
-  cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
-  chmod +w ${LIB}/$file 2>/dev/null
-fi
-
-if [ -r ${LIB}/$file ] \
-  && grep 'wait[(]union wait' ${LIB}/$file >/dev/null; then
-  echo Fixing $file, bad wait formal
-  sed -e 's@wait(union wait@wait(void@' ${LIB}/$file > ${LIB}/${file}.sed
-  rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
-  if cmp $file ${LIB}/$file >/dev/null 2>&1; then
-    rm -f ${LIB}/$file
-  fi
-fi
-
 # Don't use or define the name va_list in stdio.h.
 # This is for ANSI and also to interoperate properly with gvarargs.h.
 file=stdio.h