From 61fb3fc770566c7bafe7af8fb93590bcad387fbb Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 7 Nov 2013 12:28:46 -0800
Subject: [PATCH] Prepare to switch to the uapi <linux/signal.h>.

<time.h> didn't need to copy the cruft from <signal.h>, and
<signal.h> only needs the uid_t hack when it's not using
uapi headers.

pthread_exit.cpp should include what it uses.

Change-Id: I836c36abe0f0a781d41fc425b249d1c7686bb124
---
 libc/bionic/pthread_exit.cpp |  1 +
 libc/include/signal.h        | 10 ++++------
 libc/include/time.h          |  7 ++-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/libc/bionic/pthread_exit.cpp b/libc/bionic/pthread_exit.cpp
index aa9bd3832..cc8627109 100644
--- a/libc/bionic/pthread_exit.cpp
+++ b/libc/bionic/pthread_exit.cpp
@@ -28,6 +28,7 @@
 
 #include <pthread.h>
 
+#include <signal.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 
diff --git a/libc/include/signal.h b/libc/include/signal.h
index 5e7416165..fe2c58635 100644
--- a/libc/include/signal.h
+++ b/libc/include/signal.h
@@ -39,18 +39,16 @@
 /* For 64-bit, the kernel's struct sigaction doesn't match the POSIX one,
  * so we need to expose our own and translate behind the scenes. */
 #  define sigaction __kernel_sigaction
-#  include <asm/signal.h>
+#  include <linux/signal.h>
 #  undef sigaction
 #else
 /* For 32-bit, we're stuck with the definitions we already shipped,
  * even though they contain a sigset_t that's too small. */
-#  include <asm/signal.h>
+#  define __ARCH_SI_UID_T __kernel_uid32_t /* TODO: remove this when we switch to uapi. */
+#  include <linux/signal.h>
+#  undef __ARCH_SI_UID_T
 #endif
 
-#define __ARCH_SI_UID_T __kernel_uid32_t
-#include <asm/siginfo.h>
-#undef __ARCH_SI_UID_T
-
 __BEGIN_DECLS
 
 typedef int sig_atomic_t;
diff --git a/libc/include/time.h b/libc/include/time.h
index c2c3ee876..3f2047c75 100644
--- a/libc/include/time.h
+++ b/libc/include/time.h
@@ -32,11 +32,6 @@
 #include <sys/cdefs.h>
 #include <sys/time.h>
 
-/* For struct sigevent. */
-#define __ARCH_SI_UID_T __kernel_uid32_t
-#include <asm/siginfo.h>
-#undef __ARCH_SI_UID_T
-
 __BEGIN_DECLS
 
 #define CLOCKS_PER_SEC 1000000
@@ -45,6 +40,8 @@ extern char* tzname[];
 extern int daylight;
 extern long int timezone;
 
+struct sigevent;
+
 struct tm {
   int tm_sec;
   int tm_min;