aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2010-10-01 06:06:44 -0700
committerDan Nicolaescu2010-10-01 06:06:44 -0700
commit0781e7abcfa6e470f97b53f75c6b633f541d844f (patch)
tree05c6c5dbf0981031e01a0ff3eea89a4ad8d1b421 /src
parent9bf58201c27ba54cd9fe279979fd89814d62ed96 (diff)
downloademacs-0781e7abcfa6e470f97b53f75c6b633f541d844f.tar.gz
emacs-0781e7abcfa6e470f97b53f75c6b633f541d844f.zip
* src/callproc.c (SIGCHLD): Remove conditional definition, syssignal.h defines it.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/callproc.c7
2 files changed, 2 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 007abc4b343..dc8b4e554e2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12010-10-01 Dan Nicolaescu <dann@ics.uci.edu> 12010-10-01 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * callproc.c (SIGCHLD): Remove conditional definition, syssignal.h defines it.
4
3 * process.c: Move #include <pty.h> earlier. 5 * process.c: Move #include <pty.h> earlier.
4 (SIGCHLD): Remove conditional definition, syssignal.h defines it. 6 (SIGCHLD): Remove conditional definition, syssignal.h defines it.
5 (pty_name): Move definition later. 7 (pty_name): Move definition later.
diff --git a/src/callproc.c b/src/callproc.c
index 6f70631a484..e1ffd0c0cf6 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -24,13 +24,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
24#include <errno.h> 24#include <errno.h>
25#include <stdio.h> 25#include <stdio.h>
26#include <setjmp.h> 26#include <setjmp.h>
27
28/* Define SIGCHLD as an alias for SIGCLD. */
29
30#if !defined (SIGCHLD) && defined (SIGCLD)
31#define SIGCHLD SIGCLD
32#endif /* SIGCLD */
33
34#include <sys/types.h> 27#include <sys/types.h>
35 28
36#ifdef HAVE_UNISTD_H 29#ifdef HAVE_UNISTD_H