jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix and cleanup suseconds_t/timeval stuff (broken on 64-bit)

Browse source 
trash in the upper 32 bits was making the kernel sleep forever in
select on 64-bit systems.
This commit is contained in:
Rich Felker 2011-04-13 13:16:49 -04:00
commit cac7d837cc
3 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/x86_64/bits/alltypes.h.sh
View file

@ -55,7 +55,7 @@ TYPEDEF unsigned long uintptr_t;
TYPEDEF long time_t; TYPEDEF long time_t;
TYPEDEF long suseconds_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; }; STRUCT timespec { time_t tv_sec; long tv_nsec; };
TYPEDEF int pid_t; TYPEDEF int pid_t;

1
include/sys/select.h
View file

@ -6,6 +6,7 @@ extern "C" {
#define __NEED_size_t #define __NEED_size_t
#define __NEED_time_t #define __NEED_time_t
#define __NEED_suseconds_t
#define __NEED_struct_timeval #define __NEED_struct_timeval
#define __NEED_struct_timespec #define __NEED_struct_timespec
#define __NEED_sigset_t #define __NEED_sigset_t

9
include/sys/time.h
View file

@ -4,17 +4,8 @@
extern "C" { extern "C" {
#endif #endif
/* All symbols from select.h except pselect are required anyway... */
#include <sys/select.h> #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 *); int gettimeofday (struct timeval *, void *);
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)