summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--file.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 469c7067ca..dcc80e6618 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 14 03:43:24 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:14:56 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/rdoc/diagram.rb:
diff --git a/file.c b/file.c
index 5a99742e76..aab0afc2d6 100644
--- a/file.c
+++ b/file.c
@@ -1695,7 +1695,7 @@ chmod_internal(path, mode)
const char *path;
void *mode;
{
- if (chmod(path, (int)mode) < 0)
+ if (chmod(path, *(int *)mode) < 0)
rb_sys_fail(path);
}
@@ -1726,7 +1726,7 @@ rb_file_s_chmod(argc, 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);
}