aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2012-07-30 23:35:08 -0700
committerGlenn Morris2012-07-30 23:35:08 -0700
commit400d5621b84deaacc6d4046d21d4d40b80402786 (patch)
treeac78cfa646259b18697a9d00f03268f97f3fdf92 /src
parent7552f3ee025f0741d5cfe7ed6c9b91699f372f48 (diff)
downloademacs-400d5621b84deaacc6d4046d21d4d40b80402786.tar.gz
emacs-400d5621b84deaacc6d4046d21d4d40b80402786.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/s/usg5-4-common.h9
2 files changed, 2 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cd146728208..12afc8d080d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,8 @@
8 8
92012-07-31 Glenn Morris <rgm@gnu.org> 92012-07-31 Glenn Morris <rgm@gnu.org>
10 10
11 * s/usg5-4-common.h (wait3, WRETCODE): Let configure set them.
12
11 * conf_post.h [IRIX6_5]: Move remaining contents of s/irix6-5.h here. 13 * conf_post.h [IRIX6_5]: Move remaining contents of s/irix6-5.h here.
12 * s/irix6-5.h: Remove file. 14 * s/irix6-5.h: Remove file.
13 15
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 05f22143460..1b545aad1ce 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -33,12 +33,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
33#include <sys/stropts.h> 33#include <sys/stropts.h>
34#include <sys/termios.h> 34#include <sys/termios.h>
35#endif 35#endif
36
37/* It is possible to receive SIGCHLD when there are no children
38 waiting, because a previous waitsys(2) cleaned up the carcass of child
39 without clearing the SIGCHLD pending info. So, use a non-blocking
40 wait3 instead, which maps to waitpid(2) in SysVr4. */
41#define wait3(status, options, rusage) \
42 waitpid ((pid_t) -1, (status), (options))
43#define WRETCODE(w) (w >> 8)
44