From cac7d837ccc35b7e80d8f1eb7338f8e9d8b1b2d8 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 13 Apr 2011 13:16:49 -0400
Subject: [PATCH] fix and cleanup suseconds_t/timeval stuff (broken on 64-bit)
trash in the upper 32 bits was making the kernel sleep forever in
select on 64-bit systems.
---
arch/x86_64/bits/alltypes.h.sh | 2 +-
include/sys/select.h | 1 +
include/sys/time.h | 9 ---------
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh
index af2a4d9a..19843bd3 100755
--- a/arch/x86_64/bits/alltypes.h.sh
+++ b/arch/x86_64/bits/alltypes.h.sh
@@ -55,7 +55,7 @@ TYPEDEF unsigned long uintptr_t;
TYPEDEF long time_t;
TYPEDEF long suseconds_t;
-STRUCT timeval { time_t tv_sec; int tv_usec; };
+STRUCT timeval { time_t tv_sec; long tv_usec; };
STRUCT timespec { time_t tv_sec; long tv_nsec; };
TYPEDEF int pid_t;
diff --git a/include/sys/select.h b/include/sys/select.h
index c44eada4..54d8030f 100644
--- a/include/sys/select.h
+++ b/include/sys/select.h
@@ -6,6 +6,7 @@ extern "C" {
#define __NEED_size_t
#define __NEED_time_t
+#define __NEED_suseconds_t
#define __NEED_struct_timeval
#define __NEED_struct_timespec
#define __NEED_sigset_t
diff --git a/include/sys/time.h b/include/sys/time.h
index 70fd5687..b39800f2 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -4,17 +4,8 @@
extern "C" {
#endif
-/* All symbols from select.h except pselect are required anyway... */
#include <sys/select.h>
-#define __NEED_time_t
-#define __NEED_suseconds_t
-#define __NEED_struct_timeval
-
-#include <bits/alltypes.h>
-
-
-
int gettimeofday (struct timeval *, void *);
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
--
2.40.0