diff options
| author | YAMAMOTO Mitsuharu | 2015-12-31 10:24:12 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2015-12-31 10:24:12 +0900 |
| commit | 3b95e9c1f30f4c1dea97c787ff523e8814bfe62e (patch) | |
| tree | f7e9d440f02ba09be251065322b4c3afbdbb260c | |
| parent | 86312ffd93e54bc8993740479c9de3df69935185 (diff) | |
| download | emacs-3b95e9c1f30f4c1dea97c787ff523e8814bfe62e.tar.gz emacs-3b95e9c1f30f4c1dea97c787ff523e8814bfe62e.zip | |
Use posix_openpt instead of openpty on Darwin
* configure.ac (PTY_ITERATION, FIRST_PTY_LETTER, PTY_OPEN)
(PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF): Remove
Darwin-specific definitions. Use posix_openpt instead.
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index a5b9bd3d377..4233efa3590 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -4410,24 +4410,11 @@ case $opsys in | |||
| 4410 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, []) | 4410 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, []) |
| 4411 | ;; | 4411 | ;; |
| 4412 | 4412 | ||
| 4413 | dnl FIXME? Maybe use same as freebsd - see bug#12040. | ||
| 4414 | darwin ) | ||
| 4415 | AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)]) | ||
| 4416 | dnl Not used, because PTY_ITERATION is defined. | ||
| 4417 | AC_DEFINE(FIRST_PTY_LETTER, ['p']) | ||
| 4418 | dnl Note that openpty may fork via grantpt on Mac OS X 10.4/Darwin 8. | ||
| 4419 | dnl But we don't have to block SIGCHLD because it is blocked in the | ||
| 4420 | dnl implementation of grantpt. | ||
| 4421 | AC_DEFINE(PTY_OPEN, [ do { int slave; if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1) fd = -1; else emacs_close (slave); } while (false)]) | ||
| 4422 | AC_DEFINE(PTY_NAME_SPRINTF, []) | ||
| 4423 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, []) | ||
| 4424 | ;; | ||
| 4425 | |||
| 4426 | gnu | openbsd ) | 4413 | gnu | openbsd ) |
| 4427 | AC_DEFINE(FIRST_PTY_LETTER, ['p']) | 4414 | AC_DEFINE(FIRST_PTY_LETTER, ['p']) |
| 4428 | ;; | 4415 | ;; |
| 4429 | 4416 | ||
| 4430 | gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd | nacl ) | 4417 | gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd | darwin | nacl ) |
| 4431 | dnl if HAVE_GRANTPT | 4418 | dnl if HAVE_GRANTPT |
| 4432 | if test "x$ac_cv_func_grantpt" = xyes; then | 4419 | if test "x$ac_cv_func_grantpt" = xyes; then |
| 4433 | AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.]) | 4420 | AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.]) |