This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-721-gecd4caf
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 20 Nov 2012 00:04:57 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-721-gecd4caf
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via ecd4caf9783c99fb068a100c35899a0c3a3c6d98 (commit)
from c9c253d3729d24bff73ba4094bff386ec54a8cf1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ecd4caf9783c99fb068a100c35899a0c3a3c6d98
commit ecd4caf9783c99fb068a100c35899a0c3a3c6d98
Author: Joseph Myers <joseph@codesourcery.com>
Date: Tue Nov 20 00:04:45 2012 +0000
Fix __bswap_64 return type in generic bits/byteswap.h.
diff --git a/ChangeLog b/ChangeLog
index 55f5dde..f8dd00b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-19 Joseph Myers <joseph@codesourcery.com>
+
+ * bits/byteswap.h: Include <bits/types.h>.
+ (__bswap_64): Use __uint64_t instead of unsigned long long int.
+
2012-11-19 Pino Toscano <toscano.pino@tiscali.it>
* sysdeps/mach/hurd/ptsname.c (ptsname): Change the type of PEERNAME to
diff --git a/bits/byteswap.h b/bits/byteswap.h
index 3ca0ad6..e19e91a 100644
--- a/bits/byteswap.h
+++ b/bits/byteswap.h
@@ -24,6 +24,7 @@
#define _BITS_BYTESWAP_H 1
#include <features.h>
+#include <bits/types.h>
/* Swap bytes in 16 bit value. */
#define __bswap_constant_16(x) \
@@ -70,15 +71,15 @@ __bswap_32 (unsigned int __bsx)
| (((x) & 0x00000000000000ffull) << 56)))
# if __GNUC_PREREQ (4, 2)
-static __inline unsigned long long int
-__bswap_64 (unsigned long long int __bsx)
+static __inline __uint64_t
+__bswap_64 (__uint64_t __bsx)
{
return __builtin_bswap64 (__bsx);
}
# else
# define __bswap_64(x) \
(__extension__ \
- ({ union { __extension__ unsigned long long int __ll; \
+ ({ union { __extension__ __uint64_t __ll; \
unsigned int __l[2]; } __w, __r; \
if (__builtin_constant_p (x)) \
__r.__ll = __bswap_constant_64 (x); \
@@ -101,8 +102,8 @@ __bswap_64 (unsigned long long int __bsx)
| (((x) & 0x000000000000ff00ull) << 40) \
| (((x) & 0x00000000000000ffull) << 56))
-static __inline unsigned long long int
-__bswap_64 (unsigned long long int __bsx)
+static __inline __uint64_t
+__bswap_64 (__uint64_t __bsx)
{
return __bswap_constant_64 (__bsx);
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
bits/byteswap.h | 11 ++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
hooks/post-receive
--
GNU C Library master sources