summaryrefslogtreecommitdiffstats
path: root/libc/include/signal.h
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-11-21 00:18:07 -0800
committerDan Albert <danalbert@google.com>2014-11-21 10:26:09 -0800
commit75ef63d6cf83787233d1c45489c4ec03b0a67d16 (patch)
treeaf1358c723e21ebfbd48a4dfd2abc3f262cb309d /libc/include/signal.h
parentf6640348876cd1d4d43cc95cf63306fedb83d8b9 (diff)
downloadbionic-75ef63d6cf83787233d1c45489c4ec03b0a67d16.zip
bionic-75ef63d6cf83787233d1c45489c4ec03b0a67d16.tar.gz
bionic-75ef63d6cf83787233d1c45489c4ec03b0a67d16.tar.bz2
Move some pthread functions to signal.h.
POSIX specifies that pthread_kill(3) and pthread_sigmask(3) are supposed to live in signal.h rather than pthread.h. Since signal.h now needs pthread_t and pthread_attr_t, I've moved those defintions into include/machine/pthread_types.h to keep the namespace clean. I also sorted some includes. The combination of these two things seems to have exploded into a cascade of missing includes, so this patch also cleans up all those. Change-Id: Icfa92a39432fe83f542a797e5a113289d7e4ad0c
Diffstat (limited to 'libc/include/signal.h')
-rw-r--r--libc/include/signal.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/libc/include/signal.h b/libc/include/signal.h
index e23e65b..6d89ef7 100644
--- a/libc/include/signal.h
+++ b/libc/include/signal.h
@@ -29,12 +29,13 @@
#ifndef _SIGNAL_H_
#define _SIGNAL_H_
+#include <asm/sigcontext.h>
#include <errno.h>
+#include <limits.h>
+#include <machine/pthread_types.h>
+#include <string.h>
#include <sys/cdefs.h>
-#include <limits.h> /* For LONG_BIT */
-#include <string.h> /* For memset() */
#include <sys/types.h>
-#include <asm/sigcontext.h>
#if defined(__LP64__) || defined(__mips__)
/* For 64-bit (and mips), the kernel's struct sigaction doesn't match the POSIX one,
@@ -129,6 +130,9 @@ extern int sigaltstack(const stack_t*, stack_t*);
extern void psiginfo(const siginfo_t*, const char*);
extern void psignal(int, const char*);
+extern int pthread_kill(pthread_t, int);
+extern int pthread_sigmask(int, const sigset_t*, sigset_t*);
+
__END_DECLS
#endif /* _SIGNAL_H_ */