aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-09-07 06:17:37 -0400
committerGlenn Morris2012-09-07 06:17:37 -0400
commit843f263443272e8c323909879d4cc498873e33bb (patch)
treefa2c28af7d4e042154b15892bde2b9646bfc91ff
parente5c2edf79ba2b75a3572839fcb9de612f93ab630 (diff)
downloademacs-843f263443272e8c323909879d4cc498873e33bb.tar.gz
emacs-843f263443272e8c323909879d4cc498873e33bb.zip
Auto-commit of generated files.
-rw-r--r--autogen/config.in5
-rwxr-xr-xautogen/configure14
2 files changed, 5 insertions, 14 deletions
diff --git a/autogen/config.in b/autogen/config.in
index b6f1ad1ed60..5007eed94e8 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -158,7 +158,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
158#undef FIRST_PTY_LETTER 158#undef FIRST_PTY_LETTER
159 159
160/* Define if the float library doesn't handle errors by either setting errno, 160/* Define if the float library doesn't handle errors by either setting errno,
161 or signaling SIGFPE/SIGILL. */ 161 or signaling SIGFPE. */
162#undef FLOAT_CHECK_DOMAIN 162#undef FLOAT_CHECK_DOMAIN
163 163
164/* Enable compile-time and run-time bounds-checking, and some warnings, 164/* Enable compile-time and run-time bounds-checking, and some warnings,
@@ -1300,9 +1300,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1300/* Make process_send_signal work by "typing" a signal character on the pty. */ 1300/* Make process_send_signal work by "typing" a signal character on the pty. */
1301#undef SIGNALS_VIA_CHARACTERS 1301#undef SIGNALS_VIA_CHARACTERS
1302 1302
1303/* Define if AH_BOTTOM should include signal.h. */
1304#undef SIGNAL_H_AHB
1305
1306/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 1303/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
1307 'sig_atomic_t'. */ 1304 'sig_atomic_t'. */
1308#undef SIG_ATOMIC_T_SUFFIX 1305#undef SIG_ATOMIC_T_SUFFIX
diff --git a/autogen/configure b/autogen/configure
index 5fbbf1185cc..aa1235d8c27 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -15039,7 +15039,7 @@ case $opsys in
15039 cygwin ) 15039 cygwin )
15040 $as_echo "#define PTY_ITERATION int i; for (i = 0; i < 1; i++)" >>confdefs.h 15040 $as_echo "#define PTY_ITERATION int i; for (i = 0; i < 1; i++)" >>confdefs.h
15041 15041
15042 $as_echo "#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)" >>confdefs.h 15042 $as_echo "#define PTY_OPEN do { int dummy; sigset_t blocked, procmask; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, &procmask); if (-1 == openpty (&fd, &dummy, pty_name, 0, 0)) fd = -1; pthread_sigmask (SIG_SETMASK, &procmask, 0); if (fd >= 0) emacs_close (dummy); } while (0)" >>confdefs.h
15043 15043
15044 $as_echo "#define PTY_NAME_SPRINTF /**/" >>confdefs.h 15044 $as_echo "#define PTY_NAME_SPRINTF /**/" >>confdefs.h
15045 15045
@@ -15072,7 +15072,7 @@ $as_echo "#define UNIX98_PTYS 1" >>confdefs.h
15072 15072
15073 $as_echo "#define PTY_ITERATION int i; for (i = 0; i < 1; i++)" >>confdefs.h 15073 $as_echo "#define PTY_ITERATION int i; for (i = 0; i < 1; i++)" >>confdefs.h
15074 15074
15075 $as_echo "#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)); }" >>confdefs.h 15075 $as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptyname = 0; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCHLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); if (grantpt (fd) != -1 && unlockpt (fd) != -1) ptyname = ptsname(fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (!ptyname) { close (fd); return -1; } snprintf (pty_name, sizeof pty_name, \"%s\", ptyname); }" >>confdefs.h
15076 15076
15077 if test "x$ac_cv_func_posix_openpt" = xyes; then 15077 if test "x$ac_cv_func_posix_openpt" = xyes; then
15078 $as_echo "#define PTY_OPEN fd = posix_openpt (O_RDWR | O_NOCTTY)" >>confdefs.h 15078 $as_echo "#define PTY_OPEN fd = posix_openpt (O_RDWR | O_NOCTTY)" >>confdefs.h
@@ -15117,12 +15117,12 @@ $as_echo "#define UNIX98_PTYS 1" >>confdefs.h
15117 ;; 15117 ;;
15118 15118
15119 sol2* ) 15119 sol2* )
15120 $as_echo "#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); }" >>confdefs.h 15120 $as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptsname (int), *ptyname; int grantpt_result; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); grantpt_result = grantpt (fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (grantpt_result == -1 || unlockpt (fd) == -1 || !(ptyname = ptsname (fd))) { emacs_close (fd); return -1; } snprintf (pty_name, sizeof pty_name, \"%s\", ptyname); }" >>confdefs.h
15121 15121
15122 ;; 15122 ;;
15123 15123
15124 unixware ) 15124 unixware )
15125 $as_echo "#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); }" >>confdefs.h 15125 $as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptsname (int), *ptyname; int grantpt_result; sigset_t blocked; sigemptyset (&blocked); sigaddset (&blocked, SIGCLD); pthread_sigmask (SIG_BLOCK, &blocked, 0); grantpt_result = grantpt (fd); pthread_sigmask (SIG_UNBLOCK, &blocked, 0); if (grantpt_result == -1) fatal(\"could not grant slave pty\"); 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); }" >>confdefs.h
15126 15126
15127 ;; 15127 ;;
15128esac 15128esac
@@ -15528,12 +15528,6 @@ case $opsys in
15528$as_echo "#define XOS_NEEDS_TIME_H 1" >>confdefs.h 15528$as_echo "#define XOS_NEEDS_TIME_H 1" >>confdefs.h
15529 15529
15530 ;; 15530 ;;
15531
15532 netbsd | openbsd )
15533
15534$as_echo "#define SIGNAL_H_AHB 1" >>confdefs.h
15535
15536 ;;
15537esac 15531esac
15538 15532
15539 15533