diff mbox

[COMMITTED] NaCl: Change clock_t to long int.

Message ID 20150429223505.7CC102C3B98@topped-with-meat.com
State New
Headers show

Commit Message

Roland McGrath April 29, 2015, 10:35 p.m. UTC 
* sysdeps/nacl/bits/typesizes.h (__CLOCK_T_TYPE): Use __SLONGWORD_TYPE.
	* sysdeps/nacl/nacl-interfaces.h (nacl_abi_clock_t): Use clock_t.
diff mbox

Patch

diff --git a/sysdeps/nacl/bits/typesizes.h b/sysdeps/nacl/bits/typesizes.h
index 6443886..ed1b5dc 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 8d28e1a..0c886a5 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;