diff options
| author | Dan Nicolaescu <[email protected]> | 2010-10-01 06:04:07 -0700 |
|---|---|---|
| committer | Dan Nicolaescu <[email protected]> | 2010-10-01 06:04:07 -0700 |
| commit | 9bf58201c27ba54cd9fe279979fd89814d62ed96 (patch) | |
| tree | 9227dca532df10f3e39f69e2d411c4d5b943f9d8 | |
| parent | aecb42aa494ca9edb75bb700a807bd9eeed82dca (diff) | |
Small process.c cleanups.
* src/process.c: Move #include <pty.h> earlier.
(SIGCHLD): Remove conditional definition, syssignal.h defines it.
(pty_name): Move definition later.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/process.c | 22 |
2 files changed, 11 insertions, 15 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 753d262417..007abc4b34 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2010-10-01 Dan Nicolaescu <[email protected]> + * process.c: Move #include <pty.h> 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 a698e56fe3..c78404910a 100644 --- a/src/process.c +++ b/src/process.c @@ -82,6 +82,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <util.h> #endif +#ifdef HAVE_PTY_H +#include <pty.h> +#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 <pty.h> -#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 |