[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117055: Handle systems without WCONTINUED consis
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] emacs-24 r117055: Handle systems without WCONTINUED consistently. |
Date: |
Sat, 03 May 2014 20:13:14 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117055
revision-id: address@hidden
parent: address@hidden
fixes bugs: http://debbugs.gnu.org/15110 http://debbugs.gnu.org/17339
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-05-03 13:13:10 -0700
message:
Handle systems without WCONTINUED consistently.
* lib-src/emacsclient.c (WCONTINUED): Move to ../src/syswait.h.
* src/process.c (handle_child_signal): Remove WCONTINUED ifdef,
because WCONTINUED is always defined now.
* src/syswait.h (WCONTINUED): Move here from ../lib-src/emacsclient.c.
modified:
lib-src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1608
lib-src/emacsclient.c
emacsclient.c-20091113204419-o5vbwnq5f7feedwu-283
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/process.c process.c-20091113204419-o5vbwnq5f7feedwu-462
src/syswait.h syswait.h-20091113204419-o5vbwnq5f7feedwu-623
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2014-04-29 14:54:58 +0000
+++ b/lib-src/ChangeLog 2014-05-03 20:13:10 +0000
@@ -1,3 +1,8 @@
+2014-05-03 Paul Eggert <address@hidden>
+
+ Handle systems without WCONTINUED consistently. (Bug#15110, 17339)
+ * emacsclient.c (WCONTINUED): Move to ../src/syswait.h.
+
2014-04-29 Glenn Morris <address@hidden>
* Makefile.in ($(DESTDIR)${archlibdir}):
=== modified file 'lib-src/emacsclient.c'
--- a/lib-src/emacsclient.c 2014-03-10 00:09:30 +0000
+++ b/lib-src/emacsclient.c 2014-05-03 20:13:10 +0000
@@ -65,10 +65,6 @@
# define CLOSE_SOCKET close
# define INITIALIZE()
-# ifndef WCONTINUED
-# define WCONTINUED 8
-# endif
-
#define egetenv(VAR) getenv(VAR)
#endif /* !WINDOWSNT */
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-05-03 08:47:50 +0000
+++ b/src/ChangeLog 2014-05-03 20:13:10 +0000
@@ -1,3 +1,10 @@
+2014-05-03 Paul Eggert <address@hidden>
+
+ Handle systems without WCONTINUED consistently. (Bug#15110, 17339)
+ * process.c (handle_child_signal): Remove WCONTINUED ifdef,
+ because WCONTINUED is always defined now.
+ * syswait.h (WCONTINUED): Move here from ../lib-src/emacsclient.c.
+
2014-05-03 Eli Zaretskii <address@hidden>
* buffer.c (overlay_strings): Fix the wording of the commentary.
=== modified file 'src/process.c'
--- a/src/process.c 2014-04-29 15:12:36 +0000
+++ b/src/process.c 2014-05-03 20:13:10 +0000
@@ -6225,11 +6225,7 @@
int status;
if (p->alive
-#ifndef WCONTINUED
- && child_status_changed (p->pid, &status, WUNTRACED))
-#else
- && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED))
-#endif
+ && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED))
{
/* Change the status of the process that was found. */
p->tick = ++process_tick;
=== modified file 'src/syswait.h'
--- a/src/syswait.h 2014-01-16 06:24:06 +0000
+++ b/src/syswait.h 2014-05-03 20:13:10 +0000
@@ -29,6 +29,10 @@
#include <sys/wait.h>
#endif /* !HAVE_SYS_WAIT_H */
+#ifndef WCONTINUED
+#define WCONTINUED 8
+#endif
+
#ifndef WCOREDUMP /* not POSIX */
#define WCOREDUMP(status) ((status) & 0x80)
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117055: Handle systems without WCONTINUED consistently.,
Paul Eggert <=