Merge from emacs-24

[gnu-emacs] / src / syssignal.h

diff --git a/src/syssignal.h b/src/syssignal.h
index 7533a5a64fde2b7b8f3b6a8b4c5b56f808367941..71151ed4c6ac5cf9ecd7a75c58b69a0298976d22 100644 (file)
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -1,5 +1,6 @@
 /* syssignal.h - System-dependent definitions for signals.
-   Copyright (C) 1993, 1999, 2001-2011  Free Software Foundation, Inc.
+
+Copyright (C) 1993, 1999, 2001-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -39,7 +40,7 @@ extern sigset_t empty_mask;
 
 /* POSIX pretty much destroys any possibility of writing sigmask as a
    macro in standard C.  We always define our own version because the
-   predefined macro in Glibc 2.1 is only provided for compatility for old
+   predefined macro in Glibc 2.1 is only provided for compatibility for old
    programs that use int as signal mask type.  */
 #undef sigmask
 #ifdef __GNUC__
@@ -75,28 +76,20 @@ sigset_t sys_sigblock   (sigset_t new_mask);
 sigset_t sys_sigunblock (sigset_t new_mask);
 sigset_t sys_sigsetmask (sigset_t new_mask);
 #if ! (defined TIOCNOTTY || defined USG5 || defined CYGWIN)
-void croak (char *) NO_RETURN;
+_Noreturn void croak (char *);
 #endif
 
 #define sys_sigdel(MASK,SIG) sigdelset (&MASK,SIG)
 
 #define sigfree() sigsetmask (SIGEMPTYMASK)
 
-#if defined (SIGINFO) && defined (BROKEN_SIGINFO)
-#undef SIGINFO
-#endif
 #if defined (SIGIO) && defined (BROKEN_SIGIO)
 # undef SIGIO
 #endif
+/* These are only used by AIX  */
 #if defined (SIGPOLL) && defined (BROKEN_SIGPOLL)
 #undef SIGPOLL
 #endif
-#if defined (SIGTSTP) && defined (BROKEN_SIGTSTP)
-#undef SIGTSTP
-#endif
-#if defined (SIGURG) && defined (BROKEN_SIGURG)
-#undef SIGURG
-#endif
 #if defined (SIGAIO) && defined (BROKEN_SIGAIO)
 #undef SIGAIO
 #endif
@@ -105,6 +98,7 @@ void croak (char *) NO_RETURN;
 #endif
 
 
+/* FIXME?  Emacs only defines NSIG_MINIMUM on some platforms?  */
 #if NSIG < NSIG_MINIMUM
 # ifdef NSIG
 #  undef NSIG