aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2003-12-13 03:39:13 +0000
committerH. Peter Anvin <hpa@zytor.com>2003-12-13 03:39:13 +0000
commit5e8b3b3925583e4a698d61fef7d57b5609000856 (patch)
treefe4dfeb8313d04bed02dddb0f1f12a9e40b61294
parent567e2850389caa7b06974b7c940fb418c2c9f524 (diff)
downloadklibc-5e8b3b3925583e4a698d61fef7d57b5609000856.tar.gz
Make sig_atomic_t() a global declarationklibc-0.93
-rw-r--r--include/arch/ia64/klibc/archsignal.h2
-rw-r--r--include/signal.h6
-rw-r--r--klibc/arch/ia64/include/klibc/archsignal.h2
-rw-r--r--klibc/include/signal.h6
4 files changed, 12 insertions, 4 deletions
diff --git a/include/arch/ia64/klibc/archsignal.h b/include/arch/ia64/klibc/archsignal.h
index 9ab0ed744c011..5b01f19bc2d59 100644
--- a/include/arch/ia64/klibc/archsignal.h
+++ b/include/arch/ia64/klibc/archsignal.h
@@ -28,6 +28,4 @@ struct sigaction {
#define sa_handler _u._sa_handler
#define sa_sigaction _u._sa_sigaction
-typedef int sig_atomic_t;
-
#endif
diff --git a/include/signal.h b/include/signal.h
index 62c5083dc0458..f9eebb2a29535 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -13,6 +13,12 @@
#include <klibc/archsignal.h>
+/* 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
+typedef int sig_atomic_t;
+#endif
+
/* Some architectures don't define these */
#ifndef SA_RESETHAND
# define SA_RESETHAND SA_ONESHOT
diff --git a/klibc/arch/ia64/include/klibc/archsignal.h b/klibc/arch/ia64/include/klibc/archsignal.h
index 9ab0ed744c011..5b01f19bc2d59 100644
--- a/klibc/arch/ia64/include/klibc/archsignal.h
+++ b/klibc/arch/ia64/include/klibc/archsignal.h
@@ -28,6 +28,4 @@ struct sigaction {
#define sa_handler _u._sa_handler
#define sa_sigaction _u._sa_sigaction
-typedef int sig_atomic_t;
-
#endif
diff --git a/klibc/include/signal.h b/klibc/include/signal.h
index 62c5083dc0458..f9eebb2a29535 100644
--- a/klibc/include/signal.h
+++ b/klibc/include/signal.h
@@ -13,6 +13,12 @@
#include <klibc/archsignal.h>
+/* 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
+typedef int sig_atomic_t;
+#endif
+
/* Some architectures don't define these */
#ifndef SA_RESETHAND
# define SA_RESETHAND SA_ONESHOT