about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-04-29 13:34:32 -0700
committerRoland McGrath <roland@hack.frob.com>2015-04-29 13:34:32 -0700
commit314647f75ddfc94e600498a65ea8c7a05e9c20c0 (patch)
tree98af2a37686264c193af4afd02d580691e30b3b1
parentfdbeb9c39ef39bfa0ddf30dcf6d0f5009762bf5a (diff)
downloadglibc-314647f75ddfc94e600498a65ea8c7a05e9c20c0.tar.gz
glibc-314647f75ddfc94e600498a65ea8c7a05e9c20c0.tar.xz
glibc-314647f75ddfc94e600498a65ea8c7a05e9c20c0.zip
NaCl: Make __suseconds_t be long int rather than int32_t.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/nacl/bits/typesizes.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c32cf7ae79..5d154d2525 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-04-29  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/nacl/bits/typesizes.h (__SUSECONDS_T_TYPE): Use
+	__SLONGWORD_TYPE rather than __S32_TYPE.  They are the same size,
+	but __suseconds_t is often 'long int' so some sources assume that
+	type is being used (e.g. they use %ld to print tv_usec).
+
 2015-04-29  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #18007]
diff --git a/sysdeps/nacl/bits/typesizes.h b/sysdeps/nacl/bits/typesizes.h
index 2a29035057..644388631c 100644
--- a/sysdeps/nacl/bits/typesizes.h
+++ b/sysdeps/nacl/bits/typesizes.h
@@ -49,7 +49,7 @@
 #define __CLOCK_T_TYPE		__SQUAD_TYPE
 #define __TIME_T_TYPE		__SQUAD_TYPE
 #define __USECONDS_T_TYPE	__U32_TYPE
-#define __SUSECONDS_T_TYPE	__S32_TYPE
+#define __SUSECONDS_T_TYPE	__SLONGWORD_TYPE
 #define __DADDR_T_TYPE		__S32_TYPE
 #define __KEY_T_TYPE		__S32_TYPE
 #define __CLOCKID_T_TYPE	__S32_TYPE