From: Roland McGrath <roland@hack.frob.com>
Date: Wed, 29 Apr 2015 20:34:32 +0000 (-0700)
Subject: NaCl: Make __suseconds_t be long int rather than int32_t.
X-Git-Tag: glibc-2.22~377
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=314647f75ddfc94e600498a65ea8c7a05e9c20c0;p=thirdparty%2Fglibc.git

NaCl: Make __suseconds_t be long int rather than int32_t.
---

diff --git a/ChangeLog b/ChangeLog
index c32cf7ae792..5d154d2525d 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 2a290350572..644388631c9 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