[Emacs-diffs] /srv/bzr/emacs/trunk r109924: Auto-commit of generated files.

[Glenn Morris]

------------------------------------------------------------
revno: 109924
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-09-07 06:17:37 -0400
message:
  Auto-commit of generated files.
modified:
  autogen/config.in
  autogen/configure

=== modified file 'autogen/config.in'
--- a/autogen/config.in 2012-09-05 10:17:38 +0000
+++ b/autogen/config.in 2012-09-07 10:17:37 +0000
@@ -158,7 +158,7 @@
 #undef FIRST_PTY_LETTER
 
 /* Define if the float library doesn't handle errors by either setting errno,
-   or signaling SIGFPE/SIGILL. */
+   or signaling SIGFPE. */
 #undef FLOAT_CHECK_DOMAIN
 
 /* Enable compile-time and run-time bounds-checking, and some warnings,
@@ -1300,9 +1300,6 @@
 /* Make process_send_signal work by "typing" a signal character on the pty. */
 #undef SIGNALS_VIA_CHARACTERS
 
-/* Define if AH_BOTTOM should include signal.h. */
-#undef SIGNAL_H_AHB
-
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
    'sig_atomic_t'. */
 #undef SIG_ATOMIC_T_SUFFIX

=== modified file 'autogen/configure'
--- a/autogen/configure 2012-09-05 10:17:38 +0000
+++ b/autogen/configure 2012-09-07 10:17:37 +0000
@@ -15039,7 +15039,7 @@
   cygwin )
     $as_echo "#define PTY_ITERATION int i; for (i = 0; i < 1; i++)" 
>>confdefs.h
 
-        $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
+        $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
 
     $as_echo "#define PTY_NAME_SPRINTF /**/" >>confdefs.h
 
@@ -15072,7 +15072,7 @@
 
       $as_echo "#define PTY_ITERATION int i; for (i = 0; i < 1; i++)" 
>>confdefs.h
 
-                  $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
+                  $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
 
             if test "x$ac_cv_func_posix_openpt" = xyes; then
         $as_echo "#define PTY_OPEN fd = posix_openpt (O_RDWR | O_NOCTTY)" 
>>confdefs.h
@@ -15117,12 +15117,12 @@
     ;;
 
   sol2* )
-                            $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
+                $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
 
     ;;
 
   unixware )
-        $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
+        $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
 
     ;;
 esac
@@ -15528,12 +15528,6 @@
 $as_echo "#define XOS_NEEDS_TIME_H 1" >>confdefs.h
 
     ;;
-
-  netbsd | openbsd )
-
-$as_echo "#define SIGNAL_H_AHB 1" >>confdefs.h
-
-    ;;
 esac