NaCl: Change clock_t to long int.

diff --git a/ChangeLog b/ChangeLog
index 653cffe4e2dcdea850cc534d7e731061aeb96ff4..cf5a52c4ab4b673e43bc872290470e5e12a9a74e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 644388631c9b720f9220aedddbf1cc25eb749aff..ed1b5dc7ab2d1e3cd2c7e7e7da09a9221571c540 100644 (file)
--- 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 8d28e1a6df8cab1779ae7cb785cdf5ba5d8743f6..0c886a5bd74afca6794101d47be4c8473330b563 100644 (file)
--- 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;