[Emacs-diffs] /srv/bzr/emacs/trunk r109062: Move NSIG_MINIMUM from src/s to configure

[Glenn Morris]

------------------------------------------------------------
revno: 109062
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-12 21:19:06 -0400
message:
  Move NSIG_MINIMUM from src/s to configure
  
  * configure.ac (NSIG_MINIMUM): Move here from src/s.
  
  * src/s/usg5-4-common.h (NSIG_MINIMUM): Let configure set it.
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/s/usg5-4-common.h
  src/syssignal.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-13 00:19:10 +0000
+++ b/ChangeLog 2012-07-13 01:19:06 +0000
@@ -1,6 +1,7 @@
 2012-07-13  Glenn Morris  <address@hidden>
 
-       * configure.ac (ULIMIT_BREAK_VALUE): Move here from src/s.
+       * configure.ac (NSIG_MINIMUM, ULIMIT_BREAK_VALUE):
+       Move here from src/s.
 
 2012-07-12  Glenn Morris  <address@hidden>
 

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-13 00:19:10 +0000
+++ b/configure.ac      2012-07-13 01:19:06 +0000
@@ -3171,7 +3171,15 @@
 case $opsys in
   darwin | gnu | hpux* | *bsd )
     AC_DEFINE(NO_TERMIO, 1, [Define if termio.h should not be included.])
-  ;;
+    ;;
+
+  irix6-5 | sol2* | unixware )
+    dnl Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
+    dnl instead, there's a system variable _sys_nsig.  Unfortunately, we
+    dnl need the constant to dimension an array.  So wire in the appropriate
+    dnl value here.
+    AC_DEFINE(NSIG_MINIMUM, 32, [Minimum value of NSIG.])
+    ;;
 esac
 
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-13 00:19:10 +0000
+++ b/src/ChangeLog     2012-07-13 01:19:06 +0000
@@ -1,5 +1,7 @@
 2012-07-13  Glenn Morris  <address@hidden>
 
+       * s/usg5-4-common.h (NSIG_MINIMUM): Let configure set it.
+
        * s/gnu-linux.h, s/irix6-5.h: Let configure set ULIMIT_BREAK_VALUE.
 
        * process.c (init_process_emacs): Replace MIN_PTY_KERNEL_VERSION.

=== modified file 'src/s/usg5-4-common.h'
--- a/src/s/usg5-4-common.h     2012-07-12 07:43:05 +0000
+++ b/src/s/usg5-4-common.h     2012-07-13 01:19:06 +0000
@@ -46,11 +46,6 @@
 #include <sys/termios.h>
 #endif
 
-/* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
-   instead, there's a system variable _sys_nsig.  Unfortunately, we need the
-   constant to dimension an array.  So wire in the appropriate value here.  */
-#define NSIG_MINIMUM 32
-
 /* It is possible to receive SIGCHLD when there are no children
    waiting, because a previous waitsys(2) cleaned up the carcass of child
    without clearing the SIGCHLD pending info.  So, use a non-blocking

=== modified file 'src/syssignal.h'
--- a/src/syssignal.h   2012-07-12 01:18:45 +0000
+++ b/src/syssignal.h   2012-07-13 01:19:06 +0000
@@ -98,6 +98,7 @@
 #endif
 
 
+/* FIXME?  Emacs only defines NSIG_MINIMUM on some platforms?  */
 #if NSIG < NSIG_MINIMUM
 # ifdef NSIG
 #  undef NSIG