Fix bitrotate module.

diff --git a/ChangeLog b/ChangeLog
index c4682c920340b31ff9a4f01cf2515686c3f3135f..d085060b00b483d68d6f620e816d016f59def779 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-01  Simon Josefsson  <simon@josefsson.org>
+
+       * modules/bitrotate (configure.ac): Need
+       AC_REQUIRE([AC_C_INLINE]).
+       (Description): Mention stdint.h.  Reported by Bruno Haible
+       <bruno@clisp.org>.
+
+       * lib/bitrotate.h (rotr16, rotl16): Fix mask value.  Reported by
+       Paolo Bonzini <bonzini@gnu.org>.
+
 2008-08-31  Bruno Haible  <bruno@clisp.org>
 
        Assume Solaris specific bi-arch conventions on Solaris systems.

diff --git a/lib/bitrotate.h b/lib/bitrotate.h
index f3b6a66477fa81f2b19ac3bb39fcda5215301f1c..8123a5c7f452804cff9a871b043cb3f562ee8777 100644 (file)
--- a/lib/bitrotate.h
+++ b/lib/bitrotate.h
@@ -45,7 +45,7 @@ rotr32 (uint32_t x, int n)
 static inline uint16_t
 rotl16 (uint16_t x, int n)
 {
-  return ((x << n) | (x >> (16 - n))) & 0xFFFFFFFF;
+  return ((x << n) | (x >> (16 - n))) & 0xFFFF;
 }
 
 /* Given an unsigned 16-bit argument X, return the value corresponding
@@ -54,7 +54,7 @@ rotl16 (uint16_t x, int n)
 static inline uint16_t
 rotr16 (uint16_t x, int n)
 {
-  return ((x >> n) | (x << (16 - n))) & 0xFFFFFFFF;
+  return ((x >> n) | (x << (16 - n))) & 0xFFFF;
 }
 
 #endif /* _GL_BITROTATE_H */

diff --git a/modules/bitrotate b/modules/bitrotate
index df94a61c2026548ec4b8a7f5e08a587fe7242f55..064519c0300e44a9e1aa504ef68f4e8f36ff7469 100644 (file)
--- a/modules/bitrotate
+++ b/modules/bitrotate
@@ -1,5 +1,5 @@
 Description:
-Rotate bits in 16 and 32 bit integers.
+Rotate bits in 16 and 32 bit integers using stdint.h.
 
 Files:
 lib/bitrotate.h
@@ -7,6 +7,7 @@ lib/bitrotate.h
 Depends-on:
 
 configure.ac:
+AC_REQUIRE([AC_C_INLINE])
 
 Makefile.am:
 lib_SOURCES += bitrotate.h