diff options
| author | Glenn Morris | 2012-07-10 22:29:13 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-07-10 22:29:13 -0400 |
| commit | 9d596af370080cba1e67978018d72a836dba008a (patch) | |
| tree | 59aad1f67713cf412ae42460af7ee248601d507a | |
| parent | 20e94fdd8ec2a82d0789fc4ea354a803a14e2ec3 (diff) | |
| download | emacs-9d596af370080cba1e67978018d72a836dba008a.tar.gz emacs-9d596af370080cba1e67978018d72a836dba008a.zip | |
Move DONT_REOPEN_PTY from src/s to configure
* configure.ac (DONT_REOPEN_PTY): Move here from src/s.
* src/s/darwin.h, src/s/freebsd.h, src/s/netbsd.h:
Move DONT_REOPEN_PTY to configure.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/s/darwin.h | 5 | ||||
| -rw-r--r-- | src/s/freebsd.h | 5 | ||||
| -rw-r--r-- | src/s/netbsd.h | 5 |
6 files changed, 13 insertions, 15 deletions
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-07-11 Glenn Morris <rgm@gnu.org> | 1 | 2012-07-11 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * configure.ac (DONT_REOPEN_PTY): Move here from src/s. | ||
| 4 | |||
| 3 | * configure.ac (DEFAULT_SOUND_DEVICE): New definition. | 5 | * configure.ac (DEFAULT_SOUND_DEVICE): New definition. |
| 4 | 6 | ||
| 5 | 2012-07-10 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2012-07-10 Paul Eggert <eggert@cs.ucla.edu> |
diff --git a/configure.ac b/configure.ac index a05f4f860a8..214569e9853 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -3145,6 +3145,14 @@ case $opsys in | |||
| 3145 | ;; | 3145 | ;; |
| 3146 | esac | 3146 | esac |
| 3147 | 3147 | ||
| 3148 | case $opsys in | ||
| 3149 | darwin | freebsd | netbsd | openbsd ) | ||
| 3150 | AC_DEFINE(DONT_REOPEN_PTY, 1, [Define if process.c does not need to | ||
| 3151 | close a pty to make it a controlling terminal (it is already a | ||
| 3152 | controlling terminal of the subprocess, because we did ioctl TIOCSCTTY).]) | ||
| 3153 | ;; | ||
| 3154 | esac | ||
| 3155 | |||
| 3148 | dnl FIXME Surely we can test for this rather than hard-code it. | 3156 | dnl FIXME Surely we can test for this rather than hard-code it. |
| 3149 | case $opsys in | 3157 | case $opsys in |
| 3150 | netbsd | openbsd) sound_device="/dev/audio" ;; | 3158 | netbsd | openbsd) sound_device="/dev/audio" ;; |
diff --git a/src/ChangeLog b/src/ChangeLog index be42db2468a..244ba0148ca 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-07-11 Glenn Morris <rgm@gnu.org> | 1 | 2012-07-11 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * s/darwin.h, s/freebsd.h, s/netbsd.h: | ||
| 4 | Move DONT_REOPEN_PTY to configure. | ||
| 5 | |||
| 3 | * sound.c (DEFAULT_SOUND_DEVICE) [!WINDOWSNT]: | 6 | * sound.c (DEFAULT_SOUND_DEVICE) [!WINDOWSNT]: |
| 4 | * s/netbsd.h (DEFAULT_SOUND_DEVICE): Let configure set it. | 7 | * s/netbsd.h (DEFAULT_SOUND_DEVICE): Let configure set it. |
| 5 | 8 | ||
diff --git a/src/s/darwin.h b/src/s/darwin.h index 6b3e680c5d9..9371afee5e8 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h | |||
| @@ -126,8 +126,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 126 | context as of Darwin 9/Mac OS X 10.5. */ | 126 | context as of Darwin 9/Mac OS X 10.5. */ |
| 127 | #undef HAVE_WORKING_VFORK | 127 | #undef HAVE_WORKING_VFORK |
| 128 | #define vfork fork | 128 | #define vfork fork |
| 129 | |||
| 130 | /* Don't close pty in process.c to make it as controlling terminal. | ||
| 131 | It is already a controlling terminal of subprocess, because we did | ||
| 132 | ioctl TIOCSCTTY. */ | ||
| 133 | #define DONT_REOPEN_PTY | ||
diff --git a/src/s/freebsd.h b/src/s/freebsd.h index 04e9a19bdf8..b6bd160cc91 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h | |||
| @@ -33,11 +33,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 33 | #define BSD_SYSTEM 199506 | 33 | #define BSD_SYSTEM 199506 |
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||
| 36 | /* Don't close pty in process.c to make it as controlling terminal. | ||
| 37 | It is already a controlling terminal of subprocess, because we did | ||
| 38 | ioctl TIOCSCTTY. */ | ||
| 39 | #define DONT_REOPEN_PTY | ||
| 40 | |||
| 41 | /* Circumvent a bug in FreeBSD. In the following sequence of | 36 | /* Circumvent a bug in FreeBSD. In the following sequence of |
| 42 | writes/reads on a PTY, read(2) returns bogus data: | 37 | writes/reads on a PTY, read(2) returns bogus data: |
| 43 | 38 | ||
diff --git a/src/s/netbsd.h b/src/s/netbsd.h index 80b4442af56..cbcd54f3988 100644 --- a/src/s/netbsd.h +++ b/src/s/netbsd.h | |||
| @@ -26,11 +26,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 26 | that are handled with CPP __RENAME() macro in signal.h. */ | 26 | that are handled with CPP __RENAME() macro in signal.h. */ |
| 27 | #include <signal.h> | 27 | #include <signal.h> |
| 28 | 28 | ||
| 29 | /* Don't close pty in process.c to make it as controlling terminal. | ||
| 30 | It is already a controlling terminal of subprocess, because we did | ||
| 31 | ioctl TIOCSCTTY. */ | ||
| 32 | #define DONT_REOPEN_PTY | ||
| 33 | |||
| 34 | /* Tell that garbage collector that setjmp is known to save all | 29 | /* Tell that garbage collector that setjmp is known to save all |
| 35 | registers relevant for conservative garbage collection in the jmp_buf. */ | 30 | registers relevant for conservative garbage collection in the jmp_buf. */ |
| 36 | #define GC_SETJMP_WORKS 1 | 31 | #define GC_SETJMP_WORKS 1 |