diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-02-15 14:32:46 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-02-15 14:32:46 -0500 |
| commit | 44460c6d1eb1233f6598229d787d179c095b053f (patch) | |
| tree | d86259eded95004592f89e6ff32687fee5554cf7 | |
| parent | 062354f2e13148c6524f332f0a5aed877a3c9d61 (diff) | |
| download | musl-44460c6d1eb1233f6598229d787d179c095b053f.tar.gz | |
fix some type leakage (timer_t) from x86_64 commit
| -rwxr-xr-x | arch/i386/bits/alltypes.h.sh | 2 | ||||
| -rwxr-xr-x | arch/x86_64/bits/alltypes.h.sh | 2 | ||||
| -rw-r--r-- | arch/x86_64/bits/signal.h | 2 | ||||
| -rw-r--r-- | include/signal.h | 1 |
4 files changed, 3 insertions, 4 deletions
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 |