[Emacs-diffs] Changes to emacs/src/syswait.h

[Richard M. Stallman]

Index: emacs/src/syswait.h
diff -c emacs/src/syswait.h:1.13 emacs/src/syswait.h:1.14
*** emacs/src/syswait.h:1.13    Fri Nov 16 22:49:13 2001
--- emacs/src/syswait.h Mon Aug 12 13:27:57 2002
***************
*** 27,73 ****
  
  #ifndef VMS
  
! /* Try the approach recommended by autoconf.  If this doesn't cause
!    trouble anywhere, remove the original code, which is #if'd out
!    below.  */
  
  #if 1
  #include <sys/types.h>
  
  #ifdef HAVE_SYS_WAIT_H        /* We have sys/wait.h with POSIXoid 
definitions. */
- 
  #include <sys/wait.h>
  #ifndef WCOREDUMP             /* not POSIX */
  #define WCOREDUMP(status) ((status) & 0x80)
  #endif
! 
! #else  /* !HAVE_SYS_WAIT_H */
! 
! /* Note that sys/wait.h may still be included by stdlib.h or something
!    according to XPG.  */
! 
! #undef WEXITSTATUS
  #define WEXITSTATUS(status) (((status)  & 0xff00) >> 8)
! #undef WIFEXITED
  #define WIFEXITED(status) (WTERMSIG(status) == 0)
! #undef WIFSTOPPED
  #define WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
! #undef WIFSIGNALED
  #define WIFSIGNALED(status) (!WIFSTOPPED(status) && !WIFEXITED(status))
! #undef WSTOPSIG
  #define WSTOPSIG(status) WEXITSTATUS(status)
! #undef WTERMSIG
  #define WTERMSIG(status) ((status) & 0x7f)
! #undef WCOREDUMP
! #define WCOREDUMP(status) ((status) & 0x80)
! #endif /* HAVE_SYS_WAIT_H */
  
  #undef WAITTYPE
  #define WAITTYPE int
  #undef WRETCODE
  #define WRETCODE(status) WEXITSTATUS (status)
  
! #else  /* !1 */
  
  #ifndef WAITTYPE
  
--- 27,71 ----
  
  #ifndef VMS
  
! /* This is now really the approach recommended by Autoconf.  If this
!    doesn't cause trouble anywhere, remove the original code, which is
!    #if'd out below.  */
  
  #if 1
  #include <sys/types.h>
  
  #ifdef HAVE_SYS_WAIT_H        /* We have sys/wait.h with POSIXoid 
definitions. */
  #include <sys/wait.h>
+ #endif  /* !HAVE_SYS_WAIT_H */
+ 
  #ifndef WCOREDUMP             /* not POSIX */
  #define WCOREDUMP(status) ((status) & 0x80)
  #endif
! #ifndef WEXITSTATUS
  #define WEXITSTATUS(status) (((status)  & 0xff00) >> 8)
! #endif
! #ifndef WIFEXITED
  #define WIFEXITED(status) (WTERMSIG(status) == 0)
! #endif
! #ifndef WIFSTOPPED
  #define WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
! #endif
! #ifndef WIFSIGNALED
  #define WIFSIGNALED(status) (!WIFSTOPPED(status) && !WIFEXITED(status))
! #endif
! #ifndef WSTOPSIG
  #define WSTOPSIG(status) WEXITSTATUS(status)
! #endif
! #ifndef WTERMSIG
  #define WTERMSIG(status) ((status) & 0x7f)
! #endif
  
  #undef WAITTYPE
  #define WAITTYPE int
  #undef WRETCODE
  #define WRETCODE(status) WEXITSTATUS (status)
  
! #else  /* 0 */
  
  #ifndef WAITTYPE
  
***************
*** 134,140 ****
  #endif /* not WAIT_USE_INT */
  #endif /* no WAITTYPE */
  
! #endif /* 1 */
  
  #else /* VMS */
  
--- 132,138 ----
  #endif /* not WAIT_USE_INT */
  #endif /* no WAITTYPE */
  
! #endif /* 0 */
  
  #else /* VMS */