# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1285938247 25200
# Node ID 3bc79f337a57724422a6d1208f7d3f253058bba0
# Parent  400dd9dfdb7bcc495465ddf13bb189b3c3785b97
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.

diff -r 400dd9dfdb7b -r 3bc79f337a57 src/ChangeLog
--- a/src/ChangeLog	Fri Oct 01 12:56:44 2010 +0000
+++ b/src/ChangeLog	Fri Oct 01 06:04:07 2010 -0700
@@ -1,5 +1,9 @@
 2010-10-01  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* 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 -r 400dd9dfdb7b -r 3bc79f337a57 src/process.c
--- a/src/process.c	Fri Oct 01 12:56:44 2010 +0000
+++ b/src/process.c	Fri Oct 01 06:04:07 2010 -0700
@@ -82,6 +82,10 @@
 #include <util.h>
 #endif
 
+#ifdef HAVE_PTY_H
+#include <pty.h>
+#endif
+
 #endif	/* subprocesses */
 
 #include "lisp.h"
@@ -171,13 +175,6 @@
 /* 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 @@
 /* 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 @@
 
 #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