* bug#15110: build error: WCONTINUED undeclared
@ 2013-08-16 18:46 Dan Nicolaescu
2013-08-16 18:53 ` Glenn Morris
2014-05-03 20:17 ` Paul Eggert
0 siblings, 2 replies; 5+ messages in thread
From: Dan Nicolaescu @ 2013-08-16 18:46 UTC (permalink / raw
To: 15110
On an old redhat machine using glibc-2.2.5-44, emacs from bzr does not build anymore:
In file included from /emacs/src/process.c:34:
/emacs/src/lisp.h:2727: warning: `debug_on_exit' is narrower than values of its type
/emacs/src/process.c: In function `Faccept_process_output':
/emacs/src/process.c:3945: warning: comparison is always true due to limited range of data type
/emacs/src/process.c: In function `handle_child_signal':
/emacs/src/process.c:6180: `WCONTINUED' undeclared (first use in this function)
/emacs/src/process.c:6180: (Each undeclared identifier is reported only once
/emacs/src/process.c:6180: for each function it appears in.)
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#15110: build error: WCONTINUED undeclared
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-05-03 20:17 ` Paul Eggert
1 sibling, 1 reply; 5+ messages in thread
From: Glenn Morris @ 2013-08-16 18:53 UTC (permalink / raw
To: Dan Nicolaescu; +Cc: 15110
Dan Nicolaescu wrote:
> On an old redhat machine using glibc-2.2.5-44
That's what, a decade old Red Hat 7 machine?
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#15110: build error: WCONTINUED undeclared
2013-08-16 18:53 ` Glenn Morris
@ 2013-08-16 19:12 ` Dan Nicolaescu
2014-04-29 15:16 ` Glenn Morris
0 siblings, 1 reply; 5+ messages in thread
From: Dan Nicolaescu @ 2013-08-16 19:12 UTC (permalink / raw
To: Glenn Morris; +Cc: 15110
Glenn Morris <rgm@gnu.org> writes:
> Dan Nicolaescu wrote:
>
>> On an old redhat machine using glibc-2.2.5-44
>
> That's what, a decade old Red Hat 7 machine?
Yep, still in use (not my choice...).
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#15110: build error: WCONTINUED undeclared
2013-08-16 19:12 ` Dan Nicolaescu
@ 2014-04-29 15:16 ` Glenn Morris
0 siblings, 0 replies; 5+ messages in thread
From: Glenn Morris @ 2014-04-29 15:16 UTC (permalink / raw
To: 15110-done
Version: 24.4
I applied the following:
*** src/process.c 2014-04-16 13:27:28 +0000
--- src/process.c 2014-04-29 15:12:36 +0000
***************
*** 6225,6231 ****
int status;
if (p->alive
! && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED))
{
/* Change the status of the process that was found. */
p->tick = ++process_tick;
--- 6225,6235 ----
int status;
if (p->alive
! #ifndef WCONTINUED
! && child_status_changed (p->pid, &status, WUNTRACED))
! #else
! && child_status_changed (p->pid, &status, WUNTRACED | WCONTINUED))
! #endif
{
/* Change the status of the process that was found. */
p->tick = ++process_tick;
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#15110: build error: WCONTINUED undeclared
2013-08-16 18:46 bug#15110: build error: WCONTINUED undeclared Dan Nicolaescu
2013-08-16 18:53 ` Glenn Morris
@ 2014-05-03 20:17 ` Paul Eggert
1 sibling, 0 replies; 5+ messages in thread
From: Paul Eggert @ 2014-05-03 20:17 UTC (permalink / raw
To: 15110, 17339
[-- 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-05-03 20:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.