summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-18 12:08:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-18 12:08:16 +0000
commit29ad22694f6f105de4d0322548d6551ecdadbb26 (patch)
tree3ab5ec138a6efb1babc209ca61e03df641cca8f4
parent80243ab3869c9f317eba4d608168e21c3813cfce (diff)
* ruby.c (verbose_setter, opt_W_getter): fixed prototypes.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ruby.c10
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e0a4f3a92..9b14dfc566 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 18 21:08:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ruby.c (verbose_setter, opt_W_getter): fixed prototypes.
+
Wed Jun 18 19:20:00 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* ruby.c (opt_W_getter): use ruby_verbose directly instead of parameter
diff --git a/ruby.c b/ruby.c
index ab26e245a8..027b15f051 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1440,15 +1440,17 @@ forbid_setid(const char *s, struct cmdline_options *opt)
}
static void
-verbose_setter(VALUE val, ID id, VALUE *variable)
+verbose_setter(VALUE val, ID id, void *data)
{
- ruby_verbose = RTEST(val) ? Qtrue : val;
+ VALUE *variable = data;
+ *variable = RTEST(val) ? Qtrue : val;
}
static VALUE
-opt_W_getter(VALUE val, ID id, VALUE *variable)
+opt_W_getter(ID id, void *data)
{
- switch (ruby_verbose) {
+ VALUE *variable = data;
+ switch (*variable) {
case Qnil:
return INT2FIX(0);
case Qfalse: