[Emacs-diffs] /srv/bzr/emacs/trunk r109314: Move wait3, WRETCODE from src/s to configure

[Glenn Morris]

------------------------------------------------------------
revno: 109314
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-30 23:35:08 -0700
message:
  Move wait3, WRETCODE from src/s to configure
  
  * configure.ac (wait3, WRETCODE): Move here from src/s/usg5-4-common.h.
  
  * s/usg5-4-common.h (wait3, WRETCODE): Let configure set them.
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/s/usg5-4-common.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-31 06:19:40 +0000
+++ b/ChangeLog 2012-07-31 06:35:08 +0000
@@ -1,5 +1,7 @@
 2012-07-31  Glenn Morris  <address@hidden>
 
+       * configure.ac (wait3, WRETCODE): Move here from src/s/usg5-4-common.h.
+
        * configure.ac (opsysfile): Set to empty on hpux*, darwin;
        and to s/usg5-4-common.h on irix6-5.
 

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-31 06:19:40 +0000
+++ b/configure.ac      2012-07-31 06:35:08 +0000
@@ -3645,6 +3645,23 @@
     ;;
 esac
 
+dnl Used in process.c.
+case $opsys in
+  irix6-5 | sol2* | unixware )
+    dnl It is possible to receive SIGCHLD when there are no children
+    dnl waiting, because a previous waitsys(2) cleaned up the carcass
+    dnl of child without clearing the SIGCHLD pending info.  So, use a
+    dnl non-blocking wait3 instead, which maps to waitpid(2) in SysVr4.
+    AC_DEFINE(wait3(status, options, rusage),
+      [waitpid ((pid_t) -1, (status), (options))],
+      [Some platforms redefine this.])
+    dnl FIXME this makes no sense, because WRETCODE is only used in
+    dnl process.c, which includes syswait.h aftet config.h, and the
+    dnl former unconditionally redefines WRETCODE.
+    AC_DEFINE(WRETCODE(w), [(w >> 8)], [Some platforms redefine this.])
+    ;;
+esac
+
 
 case $opsys in
   hpux* | sol2* )

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-31 06:19:40 +0000
+++ b/src/ChangeLog     2012-07-31 06:35:08 +0000
@@ -8,6 +8,8 @@
 
 2012-07-31  Glenn Morris  <address@hidden>
 
+       * s/usg5-4-common.h (wait3, WRETCODE): Let configure set them.
+
        * conf_post.h [IRIX6_5]: Move remaining contents of s/irix6-5.h here.
        * s/irix6-5.h: Remove file.
 

=== modified file 'src/s/usg5-4-common.h'
--- a/src/s/usg5-4-common.h     2012-07-30 14:52:08 +0000
+++ b/src/s/usg5-4-common.h     2012-07-31 06:35:08 +0000
@@ -33,12 +33,3 @@
 #include <sys/stropts.h>
 #include <sys/termios.h>
 #endif
-
-/* It is possible to receive SIGCHLD when there are no children
-   waiting, because a previous waitsys(2) cleaned up the carcass of child
-   without clearing the SIGCHLD pending info.  So, use a non-blocking
-   wait3 instead, which maps to waitpid(2) in SysVr4. */
-#define wait3(status, options, rusage) \
-  waitpid ((pid_t) -1, (status), (options))
-#define WRETCODE(w) (w >> 8)
-