[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101708: Small process.c cleanups.
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101708: Small process.c cleanups. |
Date: |
Fri, 01 Oct 2010 06:04:07 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101708
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-01 06:04:07 -0700
message:
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.
modified:
src/ChangeLog
src/process.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-10-01 12:25:21 +0000
+++ b/src/ChangeLog 2010-10-01 13:04:07 +0000
@@ -1,5 +1,9 @@
2010-10-01 Dan Nicolaescu <address@hidden>
+ * 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):
=== modified file 'src/process.c'
--- a/src/process.c 2010-09-29 12:48:29 +0000
+++ b/src/process.c 2010-10-01 13:04:07 +0000
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101708: Small process.c cleanups.,
Dan Nicolaescu <=