From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 15 Feb 2011 19:32:46 +0000 (-0500)
Subject: fix some type leakage (timer_t) from x86_64 commit
X-Git-Tag: v0.6.0~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=44460c6d1eb1233f6598229d787d179c095b053f;p=oweals%2Fmusl.git

fix some type leakage (timer_t) from x86_64 commit
---

diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh
index d68579f3..a5ba060e 100755
--- a/arch/i386/bits/alltypes.h.sh
+++ b/arch/i386/bits/alltypes.h.sh
@@ -92,7 +92,7 @@ TYPEDEF long long blkcnt_t;
 TYPEDEF unsigned long long fsblkcnt_t;
 TYPEDEF unsigned long long fsfilcnt_t;
 
-TYPEDEF int timer_t;
+TYPEDEF void * timer_t;
 TYPEDEF int clockid_t;
 TYPEDEF unsigned long clock_t;
 
diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh
index 2f5cf5d2..dffb13a0 100755
--- a/arch/x86_64/bits/alltypes.h.sh
+++ b/arch/x86_64/bits/alltypes.h.sh
@@ -92,7 +92,7 @@ TYPEDEF long long blkcnt_t;
 TYPEDEF unsigned long long fsblkcnt_t;
 TYPEDEF unsigned long long fsfilcnt_t;
 
-TYPEDEF long timer_t;
+TYPEDEF void * timer_t;
 TYPEDEF int clockid_t;
 TYPEDEF long clock_t;
 
diff --git a/arch/x86_64/bits/signal.h b/arch/x86_64/bits/signal.h
index a9690488..64ece19b 100644
--- a/arch/x86_64/bits/signal.h
+++ b/arch/x86_64/bits/signal.h
@@ -14,7 +14,7 @@ struct __siginfo
 			uid_t si_uid;
 		} __kill;
 		struct {
-			timer_t si_timerid;
+			void *si_timerid;
 			int si_overrun;
 			char __pad[sizeof(uid_t) - sizeof(int)];
 			union sigval si_sigval;
diff --git a/include/signal.h b/include/signal.h
index b727fc30..d69419e3 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -14,7 +14,6 @@ extern "C" {
 #define __NEED_struct_timespec
 #define __NEED_pthread_t
 #define __NEED_time_t
-#define __NEED_timer_t
 #define __NEED_clock_t
 #define __NEED_sigset_t
 #define __NEED_siginfo_t