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 d68579f361658ca88d7cd19ceedbd9950e1c34d2..a5ba060e03f7cfbdfa3cb903848c8272a8a1532a 100755 (executable)
--- 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 2f5cf5d2157e88f05fb5a5addb362de8aefb1f42..dffb13a0c24ccab778481635435aa5442a8cedae 100755 (executable)
--- 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 a9690488f823c5f23243be159b2bfe438a500120..64ece19b946a8e5b37423ca0d356a231c9bbbfd5 100644 (file)
--- 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 b727fc30aebf9d6450ccbbe480a41d76dade9269..d69419e3a15af44f513b6fa9e5a7bc70290523ca 100644 (file)
--- 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