From: Paul Eggert <eggert@cs.ucla.edu>
To: 15110@debbugs.gnu.org, 17339@debbugs.gnu.org
Subject: bug#15110: build error: WCONTINUED undeclared
Date: Sat, 03 May 2014 13:17:06 -0700 [thread overview]
Message-ID: <53654EC2.4010803@cs.ucla.edu> (raw)
In-Reply-To: <yxqsiy9a2xv.fsf@fencepost.gnu.org>
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
I noticed that lib-src and src were solving the same problem in two
different ways, which can't be right, so I applied the attached further
patch to make it consistent, as emacs-24 bzr 117055.
[-- Attachment #2: WCONTINUED.diff --]
[-- Type: text/plain, Size: 2171 bytes --]
=== modified file 'lib-src/ChangeLog'
--- lib-src/ChangeLog 2014-04-29 14:54:58 +0000
+++ lib-src/ChangeLog 2014-05-03 20:11:49 +0000
@@ -1,3 +1,8 @@
+2014-05-03 Paul Eggert <eggert@cs.ucla.edu>
+
+ Handle systems without WCONTINUED consistently. (Bug#15110, 17339)
+ * emacsclient.c (WCONTINUED): Move to ../src/syswait.h.
+
2014-04-29 Glenn Morris <rgm@gnu.org>
* Makefile.in ($(DESTDIR)${archlibdir}):
=== modified file 'lib-src/emacsclient.c'
--- lib-src/emacsclient.c 2014-03-10 00:09:30 +0000
+++ lib-src/emacsclient.c 2014-05-03 20:11:49 +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'
--- src/ChangeLog 2014-05-03 08:47:50 +0000
+++ src/ChangeLog 2014-05-03 20:11:49 +0000
@@ -1,3 +1,10 @@
+2014-05-03 Paul Eggert <eggert@cs.ucla.edu>
+
+ 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 <eliz@gnu.org>
* buffer.c (overlay_strings): Fix the wording of the commentary.
=== modified file 'src/process.c'
--- src/process.c 2014-04-29 15:12:36 +0000
+++ src/process.c 2014-05-03 20:11:49 +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'
--- src/syswait.h 2014-01-16 06:24:06 +0000
+++ src/syswait.h 2014-05-03 20:11:49 +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 parent reply other threads:[~2014-05-03 20:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-16 18:46 bug#15110: build error: WCONTINUED undeclared Dan Nicolaescu
2013-08-16 18:53 ` Glenn Morris
2013-08-16 19:12 ` Dan Nicolaescu
2014-04-29 15:16 ` Glenn Morris
2014-05-03 20:17 ` Paul Eggert [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53654EC2.4010803@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=15110@debbugs.gnu.org \
--cc=17339@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).