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 d68579f..a5ba060 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 2f5cf5d..dffb13a 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 a969048..64ece19 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 b727fc3..d69419e 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