Browse Source

fix some type leakage (timer_t) from x86_64 commit

Rich Felker 14 years ago
parent
commit
44460c6d1e
4 changed files with 3 additions and 4 deletions
  1. 1 1
      arch/i386/bits/alltypes.h.sh
  2. 1 1
      arch/x86_64/bits/alltypes.h.sh
  3. 1 1
      arch/x86_64/bits/signal.h
  4. 0 1
      include/signal.h

+ 1 - 1
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;
 

+ 1 - 1
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;
 

+ 1 - 1
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;

+ 0 - 1
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