masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 11:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move DONT_REOPEN_PTY from src/s to configure

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2012-07-10 22:29:13 -04:00
parent 20e94fdd8e
commit 9d596af370
6 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2012-07-11 Glenn Morris <rgm@gnu.org> 2012-07-11 Glenn Morris <rgm@gnu.org>
* configure.ac (DONT_REOPEN_PTY): Move here from src/s.
* configure.ac (DEFAULT_SOUND_DEVICE): New definition. * configure.ac (DEFAULT_SOUND_DEVICE): New definition.
2012-07-10 Paul Eggert <eggert@cs.ucla.edu> 2012-07-10 Paul Eggert <eggert@cs.ucla.edu>

8
configure.ac
View file

@ -3145,6 +3145,14 @@ case $opsys in
;; ;;
esac esac
case $opsys in
darwin | freebsd | netbsd | openbsd )
AC_DEFINE(DONT_REOPEN_PTY, 1, [Define if process.c does not need to
close a pty to make it a controlling terminal (it is already a
controlling terminal of the subprocess, because we did ioctl TIOCSCTTY).])
;;
esac
dnl FIXME Surely we can test for this rather than hard-code it. dnl FIXME Surely we can test for this rather than hard-code it.
case $opsys in case $opsys in
netbsd | openbsd) sound_device="/dev/audio" ;; netbsd | openbsd) sound_device="/dev/audio" ;;

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2012-07-11 Glenn Morris <rgm@gnu.org> 2012-07-11 Glenn Morris <rgm@gnu.org>
* s/darwin.h, s/freebsd.h, s/netbsd.h:
Move DONT_REOPEN_PTY to configure.
* sound.c (DEFAULT_SOUND_DEVICE) [!WINDOWSNT]: * sound.c (DEFAULT_SOUND_DEVICE) [!WINDOWSNT]:
* s/netbsd.h (DEFAULT_SOUND_DEVICE): Let configure set it. * s/netbsd.h (DEFAULT_SOUND_DEVICE): Let configure set it.

5
src/s/darwin.h
View file

@ -126,8 +126,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
context as of Darwin 9/Mac OS X 10.5. */ context as of Darwin 9/Mac OS X 10.5. */
#undef HAVE_WORKING_VFORK #undef HAVE_WORKING_VFORK
#define vfork fork #define vfork fork
/* Don't close pty in process.c to make it as controlling terminal.
It is already a controlling terminal of subprocess, because we did
ioctl TIOCSCTTY. */
#define DONT_REOPEN_PTY

5
src/s/freebsd.h
View file

@ -33,11 +33,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define BSD_SYSTEM 199506 #define BSD_SYSTEM 199506
#endif #endif
/* Don't close pty in process.c to make it as controlling terminal.
It is already a controlling terminal of subprocess, because we did
ioctl TIOCSCTTY. */
#define DONT_REOPEN_PTY
/* Circumvent a bug in FreeBSD. In the following sequence of /* Circumvent a bug in FreeBSD. In the following sequence of
writes/reads on a PTY, read(2) returns bogus data: writes/reads on a PTY, read(2) returns bogus data:

5
src/s/netbsd.h
View file

@ -26,11 +26,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
that are handled with CPP __RENAME() macro in signal.h. */ that are handled with CPP __RENAME() macro in signal.h. */
#include <signal.h> #include <signal.h>
/* Don't close pty in process.c to make it as controlling terminal.
It is already a controlling terminal of subprocess, because we did
ioctl TIOCSCTTY. */
#define DONT_REOPEN_PTY
/* Tell that garbage collector that setjmp is known to save all /* Tell that garbage collector that setjmp is known to save all
registers relevant for conservative garbage collection in the jmp_buf. */ registers relevant for conservative garbage collection in the jmp_buf. */
#define GC_SETJMP_WORKS 1 #define GC_SETJMP_WORKS 1