diff --git a/ChangeLog b/ChangeLog
index c074c143e3..92ea36d57a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 14 03:38:54 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* file.c (rb_file_s_chmod): avoid warning where sizeof(int) !=
+	  sizeof(void*).
+
 Fri Jan 13 19:26:15 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/rdoc/diagram.rb:
diff --git a/file.c b/file.c
index cc09a42cd9..d3f7639ddf 100644
--- a/file.c
+++ b/file.c
@@ -1681,7 +1681,7 @@ rb_file_ctime(VALUE obj)
 static void
 chmod_internal(const char *path, void *mode)
 {
-    if (chmod(path, (int)mode) < 0)
+    if (chmod(path, *(int *)mode) < 0)
 	rb_sys_fail(path);
 }
 
@@ -1710,7 +1710,7 @@ rb_file_s_chmod(int argc, VALUE *argv)
     rb_scan_args(argc, argv, "1*", &vmode, &rest);
     mode = NUM2INT(vmode);
 
-    n = apply2files(chmod_internal, rest, (void *)(long)mode);
+    n = apply2files(chmod_internal, rest, &mode);
     return LONG2FIX(n);
 }