* unexnext.c:

[bpt/emacs.git] / src / syswait.h

diff --git a/src/syswait.h b/src/syswait.h
index e70e992..8079737 100644 (file)
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -1,13 +1,13 @@
 /* Define wait system call interface for Emacs.
    Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Define the structure that the wait system call stores.
    On many systems, there is a structure defined for this.
@@ -79,7 +77,7 @@ Boston, MA 02110-1301, USA.  */
 
 #else /* not WAIT_USE_INT */
 
-#if (!defined (BSD_SYSTEM) && !defined (UNIPLUS) && !defined (STRIDE) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER))
+#if (!defined (BSD_SYSTEM) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER))
 #define WAITTYPE int
 #define WIFSTOPPED(w) ((w&0377) == 0177)
 #define WIFSIGNALED(w) ((w&0377) != 0177 && (w&~0377) == 0)
@@ -93,11 +91,7 @@ Boston, MA 02110-1301, USA.  */
 
 #else
 
-#ifdef BSD4_1
-#include <wait.h>
-#else
 #include <sys/wait.h>
-#endif /* not BSD 4.1 */
 
 #define WAITTYPE union wait
 #define WRETCODE(w) w.w_retcode
@@ -129,7 +123,7 @@ Boston, MA 02110-1301, USA.  */
 #ifndef WIFEXITED
 #define WIFEXITED(w) (WTERMSIG (w) == 0)
 #endif
-#endif /* BSD_SYSTEM || UNIPLUS || STRIDE || HPUX */
+#endif /* BSD_SYSTEM || HPUX */
 #endif /* not WAIT_USE_INT */
 #endif /* no WAITTYPE */