diff options
| author | Elliott Hughes <enh@google.com> | 2013-11-05 21:54:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-05 21:54:38 +0000 |
| commit | f1258672d1eed41da30612a70690c19ff1966b73 (patch) | |
| tree | aba3d28a4d9cb417370653427e631dd9416f1445 /libc/kernel | |
| parent | 9b9f0d0cd05b5249e4b8119a8bd12ec17712b9da (diff) | |
| parent | 3503ce2177a56a8807887ee540abc68377483393 (diff) | |
| download | android_bionic-f1258672d1eed41da30612a70690c19ff1966b73.tar.gz android_bionic-f1258672d1eed41da30612a70690c19ff1966b73.tar.bz2 android_bionic-f1258672d1eed41da30612a70690c19ff1966b73.zip | |
Merge "Fix <sys/select.h> for LP64, clean up <time.h>."
Diffstat (limited to 'libc/kernel')
| -rw-r--r-- | libc/kernel/common/linux/time.h | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/libc/kernel/common/linux/time.h b/libc/kernel/common/linux/time.h index 00a556db5..62fb7df18 100644 --- a/libc/kernel/common/linux/time.h +++ b/libc/kernel/common/linux/time.h @@ -16,59 +16,60 @@ *** **************************************************************************** ****************************************************************************/ -#ifndef _LINUX_TIME_H -#define _LINUX_TIME_H +#ifndef _UAPI_LINUX_TIME_H +#define _UAPI_LINUX_TIME_H #include <linux/types.h> #ifndef _STRUCT_TIMESPEC /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define _STRUCT_TIMESPEC struct timespec { - time_t tv_sec; + __kernel_time_t tv_sec; long tv_nsec; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; #endif struct timeval { - time_t tv_sec; + __kernel_time_t tv_sec; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ - suseconds_t tv_usec; + __kernel_suseconds_t tv_usec; }; struct timezone { int tz_minuteswest; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int tz_dsttime; }; -#define NFDBITS __NFDBITS -#define FD_SETSIZE __FD_SETSIZE -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -#define FD_SET(fd,fdsetp) __FD_SET(fd,fdsetp) -#define FD_CLR(fd,fdsetp) __FD_CLR(fd,fdsetp) -#define FD_ISSET(fd,fdsetp) __FD_ISSET(fd,fdsetp) -#define FD_ZERO(fdsetp) __FD_ZERO(fdsetp) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ITIMER_REAL 0 #define ITIMER_VIRTUAL 1 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ITIMER_PROF 2 struct itimerspec { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct timespec it_interval; struct timespec it_value; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; struct itimerval { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct timeval it_interval; struct timeval it_value; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; #define CLOCK_REALTIME 0 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define CLOCK_MONOTONIC 1 #define CLOCK_PROCESS_CPUTIME_ID 2 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define CLOCK_THREAD_CPUTIME_ID 3 +#define CLOCK_MONOTONIC_RAW 4 +#define CLOCK_REALTIME_COARSE 5 +#define CLOCK_MONOTONIC_COARSE 6 +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define CLOCK_BOOTTIME 7 +#define CLOCK_REALTIME_ALARM 8 +#define CLOCK_BOOTTIME_ALARM 9 #define CLOCK_SGI_CYCLE 10 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define CLOCK_TAI 11 #define MAX_CLOCKS 16 #define CLOCKS_MASK (CLOCK_REALTIME | CLOCK_MONOTONIC) #define CLOCKS_MONO CLOCK_MONOTONIC -#define TIMER_ABSTIME 0x01 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define TIMER_ABSTIME 0x01 #endif |