diff --git a/ChangeLog b/ChangeLog
index 779402ede8..fde75383cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,17 @@
+Thu Jul  3 01:44:01 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* regint.h (GET_ALIGNMENT_PAD_SIZE, ALIGNMENT_RIGHT): cast pointer to
+	  uintptr_t instead of unsigned int.
+
 Thu Jul  3 01:23:13 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
-	 * sprintf.c: include ieeefp.h to refer isinf.
+	* sprintf.c: include ieeefp.h to refer isinf.
 
-	 * ext/bigdecimal/bigdecimal.c: ditto.
+	* ext/bigdecimal/bigdecimal.c: ditto.
 
-	 * ext/json/ext/generator/generator.c: ditto.
+	* ext/json/ext/generator/generator.c: ditto.
 
-	 * rational.c: ditto.
+	* rational.c: ditto.
 
 Thu Jul  3 01:01:57 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
diff --git a/regint.h b/regint.h
index c597fff6c9..861e13e27d 100644
--- a/regint.h
+++ b/regint.h
@@ -262,13 +262,13 @@
 
 #define GET_ALIGNMENT_PAD_SIZE(addr,pad_size) do {\
   (pad_size) = WORD_ALIGNMENT_SIZE \
-               - ((unsigned int )(addr) % WORD_ALIGNMENT_SIZE);\
+               - ((uintptr_t )(addr) % WORD_ALIGNMENT_SIZE);\
   if ((pad_size) == WORD_ALIGNMENT_SIZE) (pad_size) = 0;\
 } while (0)
 
 #define ALIGNMENT_RIGHT(addr) do {\
   (addr) += (WORD_ALIGNMENT_SIZE - 1);\
-  (addr) -= ((unsigned int )(addr) % WORD_ALIGNMENT_SIZE);\
+  (addr) -= ((uintptr_t )(addr) % WORD_ALIGNMENT_SIZE);\
 } while (0)
 
 #endif /* PLATFORM_UNALIGNED_WORD_ACCESS */