diff options
| author | Glenn Morris | 2012-08-03 16:34:35 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-08-03 16:34:35 -0400 |
| commit | ef834897aaf3259cbf1b7286fe237fb39b2cdf6d (patch) | |
| tree | 794128fb664c1c906e7faf74a15ae90ea7f0ed79 | |
| parent | 3fbc4b542cd022e5f66cbdd04860f4b84be08e80 (diff) | |
| download | emacs-ef834897aaf3259cbf1b7286fe237fb39b2cdf6d.tar.gz emacs-ef834897aaf3259cbf1b7286fe237fb39b2cdf6d.zip | |
configure.ac whitespace trivia
(Avoids some trailing whitespace in generated config.h.)
| -rw-r--r-- | configure.ac | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index a80cb37bc11..e9e04a4daef 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -3363,31 +3363,31 @@ AH_TEMPLATE(PTY_TTY_NAME_SPRINTF, [How to get device name of the tty | |||
| 3363 | 3363 | ||
| 3364 | case $opsys in | 3364 | case $opsys in |
| 3365 | aix4-2 ) | 3365 | aix4-2 ) |
| 3366 | AC_DEFINE(PTY_ITERATION, [int c; for (c = 0; !c ; c++)] ) | 3366 | AC_DEFINE(PTY_ITERATION, [int c; for (c = 0; !c ; c++)]) |
| 3367 | dnl You allocate a pty by opening /dev/ptc to get the master side. | 3367 | dnl You allocate a pty by opening /dev/ptc to get the master side. |
| 3368 | dnl To get the name of the slave side, you just ttyname() the master side. | 3368 | dnl To get the name of the slave side, you just ttyname() the master side. |
| 3369 | AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptc");] ) | 3369 | AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptc");]) |
| 3370 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [strcpy (pty_name, ttyname (fd));] ) | 3370 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [strcpy (pty_name, ttyname (fd));]) |
| 3371 | ;; | 3371 | ;; |
| 3372 | 3372 | ||
| 3373 | cygwin ) | 3373 | cygwin ) |
| 3374 | AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)] ) | 3374 | AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)]) |
| 3375 | dnl multi-line AC_DEFINEs are hard. :( | 3375 | dnl multi-line AC_DEFINEs are hard. :( |
| 3376 | AC_DEFINE(PTY_OPEN, [ do { int dummy; SIGMASKTYPE mask; mask = sigblock (sigmask (SIGCHLD)); if (-1 == openpty (&fd, &dummy, pty_name, 0, 0)) fd = -1; sigsetmask (mask); if (fd >= 0) emacs_close (dummy); } while (0)] ) | 3376 | AC_DEFINE(PTY_OPEN, [ do { int dummy; SIGMASKTYPE mask; mask = sigblock (sigmask (SIGCHLD)); if (-1 == openpty (&fd, &dummy, pty_name, 0, 0)) fd = -1; sigsetmask (mask); if (fd >= 0) emacs_close (dummy); } while (0)]) |
| 3377 | AC_DEFINE(PTY_NAME_SPRINTF, [] ) | 3377 | AC_DEFINE(PTY_NAME_SPRINTF, []) |
| 3378 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [] ) | 3378 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, []) |
| 3379 | ;; | 3379 | ;; |
| 3380 | 3380 | ||
| 3381 | darwin ) | 3381 | darwin ) |
| 3382 | AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)] ) | 3382 | AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)]) |
| 3383 | dnl Not used, because PTY_ITERATION is defined. | 3383 | dnl Not used, because PTY_ITERATION is defined. |
| 3384 | AC_DEFINE(FIRST_PTY_LETTER, ['p']) | 3384 | AC_DEFINE(FIRST_PTY_LETTER, ['p']) |
| 3385 | dnl Note that openpty may fork via grantpt on Mac OS X 10.4/Darwin 8. | 3385 | dnl Note that openpty may fork via grantpt on Mac OS X 10.4/Darwin 8. |
| 3386 | dnl But we don't have to block SIGCHLD because it is blocked in the | 3386 | dnl But we don't have to block SIGCHLD because it is blocked in the |
| 3387 | dnl implementation of grantpt. | 3387 | dnl implementation of grantpt. |
| 3388 | AC_DEFINE(PTY_OPEN, [ do { int slave; if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1) fd = -1; else emacs_close (slave); } while (0)] ) | 3388 | AC_DEFINE(PTY_OPEN, [ do { int slave; if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1) fd = -1; else emacs_close (slave); } while (0)]) |
| 3389 | AC_DEFINE(PTY_NAME_SPRINTF, [] ) | 3389 | AC_DEFINE(PTY_NAME_SPRINTF, []) |
| 3390 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [] ) | 3390 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, []) |
| 3391 | ;; | 3391 | ;; |
| 3392 | 3392 | ||
| 3393 | gnu | freebsd | netbsd | openbsd ) | 3393 | gnu | freebsd | netbsd | openbsd ) |
| @@ -3398,16 +3398,16 @@ case $opsys in | |||
| 3398 | dnl if HAVE_GRANTPT | 3398 | dnl if HAVE_GRANTPT |
| 3399 | if test "x$ac_cv_func_grantpt" = xyes; then | 3399 | if test "x$ac_cv_func_grantpt" = xyes; then |
| 3400 | AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.]) | 3400 | AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.]) |
| 3401 | AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)] ) | 3401 | AC_DEFINE(PTY_ITERATION, [int i; for (i = 0; i < 1; i++)]) |
| 3402 | dnl Note that grantpt and unlockpt may fork. We must block SIGCHLD | 3402 | dnl Note that grantpt and unlockpt may fork. We must block SIGCHLD |
| 3403 | dnl to prevent sigchld_handler from intercepting the child's death. | 3403 | dnl to prevent sigchld_handler from intercepting the child's death. |
| 3404 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptyname; sigblock (sigmask (SIGCHLD)); if (grantpt (fd) == -1 || unlockpt (fd) == -1 || !(ptyname = ptsname(fd))) { sigunblock (sigmask (SIGCHLD)); close (fd); return -1; } snprintf (pty_name, sizeof pty_name, "%s", ptyname); sigunblock (sigmask (SIGCHLD)); }] ) | 3404 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptyname; sigblock (sigmask (SIGCHLD)); if (grantpt (fd) == -1 || unlockpt (fd) == -1 || !(ptyname = ptsname(fd))) { sigunblock (sigmask (SIGCHLD)); close (fd); return -1; } snprintf (pty_name, sizeof pty_name, "%s", ptyname); sigunblock (sigmask (SIGCHLD)); }]) |
| 3405 | dnl if HAVE_GETPT | 3405 | dnl if HAVE_GETPT |
| 3406 | if test "x$ac_cv_func_getpt" = xyes; then | 3406 | if test "x$ac_cv_func_getpt" = xyes; then |
| 3407 | AC_DEFINE(PTY_OPEN, [fd = getpt ()]) | 3407 | AC_DEFINE(PTY_OPEN, [fd = getpt ()]) |
| 3408 | AC_DEFINE(PTY_NAME_SPRINTF, [] ) | 3408 | AC_DEFINE(PTY_NAME_SPRINTF, []) |
| 3409 | else | 3409 | else |
| 3410 | AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");] ) | 3410 | AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");]) |
| 3411 | fi | 3411 | fi |
| 3412 | else | 3412 | else |
| 3413 | AC_DEFINE(FIRST_PTY_LETTER, ['p']) | 3413 | AC_DEFINE(FIRST_PTY_LETTER, ['p']) |
| @@ -3416,8 +3416,8 @@ case $opsys in | |||
| 3416 | 3416 | ||
| 3417 | hpux*) | 3417 | hpux*) |
| 3418 | AC_DEFINE(FIRST_PTY_LETTER, ['p']) | 3418 | AC_DEFINE(FIRST_PTY_LETTER, ['p']) |
| 3419 | AC_DEFINE(PTY_NAME_SPRINTF, [sprintf (pty_name, "/dev/ptym/pty%c%x", c, i);] ) | 3419 | AC_DEFINE(PTY_NAME_SPRINTF, [sprintf (pty_name, "/dev/ptym/pty%c%x", c, i);]) |
| 3420 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [sprintf (pty_name, "/dev/pty/tty%c%x", c, i);] ) | 3420 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [sprintf (pty_name, "/dev/pty/tty%c%x", c, i);]) |
| 3421 | ;; | 3421 | ;; |
| 3422 | 3422 | ||
| 3423 | irix6-5 ) | 3423 | irix6-5 ) |
| @@ -3434,11 +3434,11 @@ case $opsys in | |||
| 3434 | AC_DEFINE(PTY_ITERATION, []) | 3434 | AC_DEFINE(PTY_ITERATION, []) |
| 3435 | dnl Not used, because PTY_ITERATION is defined. | 3435 | dnl Not used, because PTY_ITERATION is defined. |
| 3436 | AC_DEFINE(FIRST_PTY_LETTER, ['q']) | 3436 | AC_DEFINE(FIRST_PTY_LETTER, ['q']) |
| 3437 | AC_DEFINE(PTY_OPEN, [ { struct sigaction ocstat, cstat; struct stat stb; char * name; sigemptyset(&cstat.sa_mask); cstat.sa_handler = SIG_DFL; cstat.sa_flags = 0; sigaction(SIGCLD, &cstat, &ocstat); name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0); sigaction(SIGCLD, &ocstat, (struct sigaction *)0); if (name == 0) return -1; if (fd < 0) return -1; if (fstat (fd, &stb) < 0) return -1; strcpy (pty_name, name); }] ) | 3437 | AC_DEFINE(PTY_OPEN, [ { struct sigaction ocstat, cstat; struct stat stb; char * name; sigemptyset(&cstat.sa_mask); cstat.sa_handler = SIG_DFL; cstat.sa_flags = 0; sigaction(SIGCLD, &cstat, &ocstat); name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0); sigaction(SIGCLD, &ocstat, (struct sigaction *)0); if (name == 0) return -1; if (fd < 0) return -1; if (fstat (fd, &stb) < 0) return -1; strcpy (pty_name, name); }]) |
| 3438 | dnl No need to get the pty name at all. | 3438 | dnl No need to get the pty name at all. |
| 3439 | AC_DEFINE(PTY_NAME_SPRINTF, [] ) | 3439 | AC_DEFINE(PTY_NAME_SPRINTF, []) |
| 3440 | dnl No need to use sprintf to get the tty name--we get that from _getpty. | 3440 | dnl No need to use sprintf to get the tty name--we get that from _getpty. |
| 3441 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [] ) | 3441 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, []) |
| 3442 | ;; | 3442 | ;; |
| 3443 | 3443 | ||
| 3444 | sol2* ) | 3444 | sol2* ) |
| @@ -3448,12 +3448,12 @@ case $opsys in | |||
| 3448 | dnl On SysVr4, grantpt(3) forks a subprocess, so keep sigchld_handler() | 3448 | dnl On SysVr4, grantpt(3) forks a subprocess, so keep sigchld_handler() |
| 3449 | dnl from intercepting that death. If any child but grantpt's should die | 3449 | dnl from intercepting that death. If any child but grantpt's should die |
| 3450 | dnl within, it should be caught after sigrelse(2). | 3450 | dnl within, it should be caught after sigrelse(2). |
| 3451 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptsname (int), *ptyname; sigblock (sigmask (SIGCLD)); if (grantpt (fd) == -1) { emacs_close (fd); return -1; } sigunblock (sigmask (SIGCLD)); if (unlockpt (fd) == -1) { emacs_close (fd); return -1; } if (!(ptyname = ptsname (fd))) { emacs_close (fd); return -1; } snprintf (pty_name, sizeof pty_name, "%s", ptyname); }] ) | 3451 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptsname (int), *ptyname; sigblock (sigmask (SIGCLD)); if (grantpt (fd) == -1) { emacs_close (fd); return -1; } sigunblock (sigmask (SIGCLD)); if (unlockpt (fd) == -1) { emacs_close (fd); return -1; } if (!(ptyname = ptsname (fd))) { emacs_close (fd); return -1; } snprintf (pty_name, sizeof pty_name, "%s", ptyname); }]) |
| 3452 | ;; | 3452 | ;; |
| 3453 | 3453 | ||
| 3454 | unixware ) | 3454 | unixware ) |
| 3455 | dnl Comments are as per sol2*. | 3455 | dnl Comments are as per sol2*. |
| 3456 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptsname (int), *ptyname; sigblock(sigmask(SIGCLD)); if (grantpt(fd) == -1) fatal("could not grant slave pty"); sigunblock(sigmask(SIGCLD)); if (unlockpt(fd) == -1) fatal("could not unlock slave pty"); if (!(ptyname = ptsname(fd))) fatal ("could not enable slave pty"); snprintf (pty_name, sizeof pty_name, "%s", ptyname); }] ) | 3456 | AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptsname (int), *ptyname; sigblock(sigmask(SIGCLD)); if (grantpt(fd) == -1) fatal("could not grant slave pty"); sigunblock(sigmask(SIGCLD)); if (unlockpt(fd) == -1) fatal("could not unlock slave pty"); if (!(ptyname = ptsname(fd))) fatal ("could not enable slave pty"); snprintf (pty_name, sizeof pty_name, "%s", ptyname); }]) |
| 3457 | ;; | 3457 | ;; |
| 3458 | esac | 3458 | esac |
| 3459 | 3459 | ||
| @@ -3463,7 +3463,7 @@ case $opsys in | |||
| 3463 | dnl This change means that we don't loop through allocate_pty too | 3463 | dnl This change means that we don't loop through allocate_pty too |
| 3464 | dnl many times in the (rare) event of a failure. | 3464 | dnl many times in the (rare) event of a failure. |
| 3465 | AC_DEFINE(FIRST_PTY_LETTER, ['z']) | 3465 | AC_DEFINE(FIRST_PTY_LETTER, ['z']) |
| 3466 | AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");] ) | 3466 | AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");]) |
| 3467 | dnl Push various streams modules onto a PTY channel. Used in process.c. | 3467 | dnl Push various streams modules onto a PTY channel. Used in process.c. |
| 3468 | AC_DEFINE(SETUP_SLAVE_PTY, [if (ioctl (xforkin, I_PUSH, "ptem") == -1) fatal ("ioctl I_PUSH ptem"); if (ioctl (xforkin, I_PUSH, "ldterm") == -1) fatal ("ioctl I_PUSH ldterm"); if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) fatal ("ioctl I_PUSH ttcompat");], [How to set up a slave PTY, if needed.]) | 3468 | AC_DEFINE(SETUP_SLAVE_PTY, [if (ioctl (xforkin, I_PUSH, "ptem") == -1) fatal ("ioctl I_PUSH ptem"); if (ioctl (xforkin, I_PUSH, "ldterm") == -1) fatal ("ioctl I_PUSH ldterm"); if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) fatal ("ioctl I_PUSH ttcompat");], [How to set up a slave PTY, if needed.]) |
| 3469 | ;; | 3469 | ;; |
| @@ -3596,7 +3596,7 @@ case $opsys in | |||
| 3596 | darwin) AC_DEFINE(TAB3, OXTABS) ;; | 3596 | darwin) AC_DEFINE(TAB3, OXTABS) ;; |
| 3597 | 3597 | ||
| 3598 | gnu | freebsd | netbsd | openbsd ) | 3598 | gnu | freebsd | netbsd | openbsd ) |
| 3599 | AC_DEFINE(TABDLY, OXTABS, [Undocumented.] ) | 3599 | AC_DEFINE(TABDLY, OXTABS, [Undocumented.]) |
| 3600 | AC_DEFINE(TAB3, OXTABS) | 3600 | AC_DEFINE(TAB3, OXTABS) |
| 3601 | ;; | 3601 | ;; |
| 3602 | 3602 | ||