Update.

2000-12-26  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/generic/bits/byteswap.h (__bswap_64): Make it usable for
	64bit platforms.  Reported by Dave Gilbert <gilbertd@treblig.org>.

diff --git a/ChangeLog b/ChangeLog
index 7c92455..e460a12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-26  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/generic/bits/byteswap.h (__bswap_64): Make it usable for
+       64bit platforms.  Reported by Dave Gilbert <gilbertd@treblig.org>.
+
 2000-12-11  Bruno Haible  <haible@clisp.cons.org>
 
        * Makefile ($(inst_includedir)/gnu/stubs.h): Sort in the C locale.

diff --git a/bits/byteswap.h b/bits/byteswap.h
index 6b51156..b193ea1 100644 (file)
--- a/bits/byteswap.h
+++ b/bits/byteswap.h
@@ -1,5 +1,5 @@
 /* Macros to swap the order of bytes in integer values.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -56,7 +56,7 @@ __bswap_32 (unsigned int __bsx)
 # define __bswap_64(x) \
      (__extension__                                                          \
       ({ union { unsigned long long int __ll;                                \
-                unsigned long int __l[2]; } __v, __r;                        \
+                unsigned int __l[2]; } __v, __r;                             \
         __v.__ll = (x);                                                      \
         __r.__l[0] = __bswap_32 (__v.__l[1]);                                \
         __r.__l[1] = __bswap_32 (__v.__l[0]);                                \

diff --git a/sysdeps/generic/bits/byteswap.h b/sysdeps/generic/bits/byteswap.h
index 6b51156..b193ea1 100644 (file)
--- a/sysdeps/generic/bits/byteswap.h
+++ b/sysdeps/generic/bits/byteswap.h
@@ -1,5 +1,5 @@
 /* Macros to swap the order of bytes in integer values.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -56,7 +56,7 @@ __bswap_32 (unsigned int __bsx)
 # define __bswap_64(x) \
      (__extension__                                                          \
       ({ union { unsigned long long int __ll;                                \
-                unsigned long int __l[2]; } __v, __r;                        \
+                unsigned int __l[2]; } __v, __r;                             \
         __v.__ll = (x);                                                      \
         __r.__l[0] = __bswap_32 (__v.__l[1]);                                \
         __r.__l[1] = __bswap_32 (__v.__l[0]);                                \