[PATCH] klibc: version 1.0.4

[elogind.git] / klibc / include / signal.h

diff --git a/klibc/include/signal.h b/klibc/include/signal.h
index 1b439077f209fce8cfe71d7cdf97b52b75d8b5dc..ab3c98d6e4cfa7f27369b0ed035cf0acf26394e8 100644 (file)
--- a/klibc/include/signal.h
+++ b/klibc/include/signal.h
@@ -16,7 +16,7 @@
 
 /* glibc seems to use sig_atomic_t as "int" pretty much on all architectures.
    Do the same, but allow the architecture to override. */
-#ifdef _KLIBC_HAS_ARCH_SIG_ATOMIC_T
+#ifndef _KLIBC_HAS_ARCH_SIG_ATOMIC_T
 typedef int sig_atomic_t;
 #endif
 
@@ -27,9 +27,20 @@ typedef int sig_atomic_t;
 #ifndef SA_NODEFER
 # define SA_NODEFER SA_NOMASK
 #endif
+/* Some architectures define NSIG and not _NSIG or vice versa */
 #ifndef NSIG
 # define NSIG _NSIG
 #endif
+#ifndef _NSIG
+# define _NSIG NSIG
+#endif
+
+/* If we don't have any real-time signals available to userspace,
+   hide them all */
+#if SIGRTMAX <= SIGRTMIN
+# undef SIGRTMIN
+# undef SIGRTMAX
+#endif
 
 __extern const char * const sys_siglist[];