From 9bf58201c27ba54cd9fe279979fd89814d62ed96 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 1 Oct 2010 06:04:07 -0700 Subject: [PATCH] Small process.c cleanups. * src/process.c: Move #include earlier. (SIGCHLD): Remove conditional definition, syssignal.h defines it. (pty_name): Move definition later. --- src/ChangeLog | 4 ++++ src/process.c | 22 +++++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 753d262417a..007abc4b343 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2010-10-01 Dan Nicolaescu + * process.c: Move #include earlier. + (SIGCHLD): Remove conditional definition, syssignal.h defines it. + (pty_name): Move definition later. + * nsselect.m (syms_of_nsselect): * nsmenu.m (syms_of_nsmenu): * nsfns.m (syms_of_nsfns): diff --git a/src/process.c b/src/process.c index a698e56fe39..c78404910af 100644 --- a/src/process.c +++ b/src/process.c @@ -82,6 +82,10 @@ along with GNU Emacs. If not, see . */ #include #endif +#ifdef HAVE_PTY_H +#include +#endif + #endif /* subprocesses */ #include "lisp.h" @@ -171,13 +175,6 @@ extern Lisp_Object QCfilter; /* Define first descriptor number available for subprocesses. */ #define FIRST_PROC_DESC 3 -/* Define SIGCHLD as an alias for SIGCLD. There are many conditionals - testing SIGCHLD. */ - -#if !defined (SIGCHLD) && defined (SIGCLD) -#define SIGCHLD SIGCLD -#endif /* SIGCLD */ - extern const char *get_operating_system_release (void); /* From sysdep.c or w32.c */ @@ -356,14 +353,6 @@ struct sockaddr_and_len { /* Maximum number of bytes to send to a pty without an eof. */ static int pty_max_bytes; -#ifdef HAVE_PTYS -#ifdef HAVE_PTY_H -#include -#endif -/* The file name of the pty opened by allocate_pty. */ - -static char pty_name[24]; -#endif struct fd_callback_data @@ -563,6 +552,9 @@ status_message (struct Lisp_Process *p) #ifdef HAVE_PTYS +/* The file name of the pty opened by allocate_pty. */ +static char pty_name[24]; + /* Open an available pty, returning a file descriptor. Return -1 on failure. The file name of the terminal corresponding to the pty -- 2.39.5