* gettextP.h (SWAP): Change parameter type to unsigned int.

From-SVN: r53879

diff --git a/gcc/intl/ChangeLog b/gcc/intl/ChangeLog
index e693b211453514bb5708a31364c26333a4356306..e702f26a28ec08f27fa8da6bbc73b469e18f039f 100644 (file)
--- a/gcc/intl/ChangeLog
+++ b/gcc/intl/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-25  Roman Lechtchinsky  <rl@cs.tu-berlin.de>
+
+       * gettextP.h (SWAP): Change parameter type to unsigned int.
+
 2002-05-14  Release Manager
 
        * GCC 3.1 Released.

diff --git a/gcc/intl/gettextP.h b/gcc/intl/gettextP.h
index 5a925519e567df7a657974179786a9a3cf66a7df..31f6d2c19856b7aa7315fa45cc019591b8a89776 100644 (file)
--- a/gcc/intl/gettextP.h
+++ b/gcc/intl/gettextP.h
@@ -63,12 +63,14 @@
 # include <byteswap.h>
 # define SWAP(i) bswap_32 (i)
 #else
-/* GCC LOCAL: Prototype first to avoid warnings.  */
-static inline nls_uint32 SWAP PARAMS ((nls_uint32));
+/* GCC LOCAL: Prototype first to avoid warnings; change argument to 
+   unsigned int to avoid K&R type promotion errors with 64-bit "int".  */
+static inline nls_uint32 SWAP PARAMS ((unsigned int));
 static inline nls_uint32
 SWAP (i)
-     nls_uint32 i;
+     unsigned int ii;
 {
+  nls_uint32 i = ii;
   return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
 }
 #endif