diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2132888d522cd20bb744e3c2255a8d7a216ef67d..f9df376720a979ad7e39dffb2d03b6a9b964f246 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-25  Ben Elliston  <bje@au.ibm.com>
+
+	* dfp.c (dfp_byte_swap): Use uint32_t and not unsigned long.
+
 2006-01-24  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR tree-opt/25860
@@ -1634,10 +1638,10 @@
 
 2006-01-16  Rafael Ãvila de Espíndola <rafael.espindola@gmail.com>
 
-	* cppspec.c (lang_specific_spec_functions): remove
-	* gcc.c (lookup_spec_function): use static_spec_functions directelly
-	* gcc.h (lang_specific_spec_functions): remove
-	* gccspec.c (lang_specific_spec_functions): remove
+	* cppspec.c (lang_specific_spec_functions): Remove.
+	* gcc.c (lookup_spec_function): Use static_spec_functions directly.
+	* gcc.h (lang_specific_spec_functions): Remove.
+	* gccspec.c (lang_specific_spec_functions): Remove.
 
 2005-01-16  Paolo Bonzini  <bonzini@gnu.org>
 
diff --git a/gcc/dfp.c b/gcc/dfp.c
index 55c6f2de4f59e7e9675dab4d054ce9e13b6bf2a6..804f2031ca18f613014a91d398b89e5280e4fb07 100644
--- a/gcc/dfp.c
+++ b/gcc/dfp.c
@@ -36,13 +36,13 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "decimal32.h"
 #include "decNumber.h"
 
-static unsigned long
-dfp_byte_swap (unsigned long in)
+static uint32_t
+dfp_byte_swap (uint32_t in)
 {
-  unsigned long out;
+  uint32_t out = 0;
   unsigned char *p = (unsigned char *) &out;
   union {
-    unsigned long i;
+    uint32_t i;
     unsigned char b[4];
   } u;