X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbyteswap_.h;h=ca8554431951d4e3ba048d32e746a88615f7ee33;hb=5d95b32a83f1663be6172f07b21ba7615b6055f4;hp=ac82abe55d4ef7926c1d22951c7f77d814eb7d93;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git

diff --git a/lib/byteswap_.h b/lib/byteswap_.h
index ac82abe55..ca8554431 100644
--- a/lib/byteswap_.h
+++ b/lib/byteswap_.h
@@ -1,23 +1,23 @@
 /* byteswap.h - Byte swapping
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007 Free Software Foundation, Inc.
    Written by Oskar Liljeblad <oskar@osk.mine.nu>, 2005.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef _BYTESWAP_H
+#ifndef _GL_BYTESWAP_H
+#define _GL_BYTESWAP_H
 
 /* Given an unsigned 16-bit argument X, return the value corresponding to
    X with reversed byte order.  */
@@ -28,7 +28,7 @@
    X with reversed byte order.  */
 #define bswap_32(x) ((((x) & 0x000000FF) << 24) | \
 		     (((x) & 0x0000FF00) << 8) | \
-		     (((x) & 0x00FF0000) << 8) | \
+		     (((x) & 0x00FF0000) >> 8) | \
 		     (((x) & 0xFF000000) >> 24))
 
 /* Given an unsigned 64-bit argument X, return the value corresponding to
@@ -42,4 +42,4 @@
 		     (((x) & 0x00FF000000000000ULL) >> 40) | \
 		     (((x) & 0xFF00000000000000ULL) >> 56))
 
-#endif
+#endif /* _GL_BYTESWAP_H */