diff options
| author | Roland McGrath <roland@hack.frob.com> | 2015-04-29 15:34:34 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2015-04-29 15:34:34 -0700 |
| commit | 45c2c5640354b52e5d7acd0a14748e76887d4081 (patch) | |
| tree | eea1b8ad4b44cb13dfff0e51ffdd6464a6c58a7f | |
| parent | 3600cf1e524b2aad379fa5dc76d5e124b23fc9fa (diff) | |
| download | glibc-45c2c5640354b52e5d7acd0a14748e76887d4081.tar.gz | |
NaCl: Change clock_t to long int.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/nacl/bits/typesizes.h | 2 | ||||
| -rw-r--r-- | sysdeps/nacl/nacl-interfaces.h | 5 |
3 files changed, 7 insertions, 3 deletions
@@ -1,5 +1,8 @@ 2015-04-29 Roland McGrath <roland@hack.frob.com> + * sysdeps/nacl/bits/typesizes.h (__CLOCK_T_TYPE): Use __SLONGWORD_TYPE. + * sysdeps/nacl/nacl-interfaces.h (nacl_abi_clock_t): Use clock_t. + * sysdeps/nacl/euidaccess.c (euidaccess): Renamed to __euidaccess. (euidaccess, eaccess): Define as weak aliases. diff --git a/sysdeps/nacl/bits/typesizes.h b/sysdeps/nacl/bits/typesizes.h index 644388631c..ed1b5dc7ab 100644 --- a/sysdeps/nacl/bits/typesizes.h +++ b/sysdeps/nacl/bits/typesizes.h @@ -46,7 +46,7 @@ #define __FSFILCNT64_T_TYPE __FSFILCNT_T_TYPE #define __FSWORD_T_TYPE __SWORD_TYPE #define __ID_T_TYPE __U32_TYPE -#define __CLOCK_T_TYPE __SQUAD_TYPE +#define __CLOCK_T_TYPE __SLONGWORD_TYPE #define __TIME_T_TYPE __SQUAD_TYPE #define __USECONDS_T_TYPE __U32_TYPE #define __SUSECONDS_T_TYPE __SLONGWORD_TYPE diff --git a/sysdeps/nacl/nacl-interfaces.h b/sysdeps/nacl/nacl-interfaces.h index 8d28e1a6df..0c886a5bd7 100644 --- a/sysdeps/nacl/nacl-interfaces.h +++ b/sysdeps/nacl/nacl-interfaces.h @@ -41,8 +41,9 @@ typedef struct dirent nacl_abi_dirent_t; typedef struct timeval nacl_abi_timeval_t; typedef struct timespec nacl_abi_timespec_t; -/* XXX change clock_t? */ -typedef uint32_t nacl_abi_clock_t; +/* This is unsigned in the IRT ABI, but it's traditionally 'long int', + so we stick with that. */ +typedef clock_t nacl_abi_clock_t; typedef int32_t nacl_abi_blkcnt_t; |