aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--localeinit.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d24af0d0f..266bd13545 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 26 06:34:24 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * localeinit.c (rb_locale_charmap_index): fix prototype. [Bug #12118]
+
Fri Mar 25 16:40:48 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* test/ruby/enc/test_case_mapping.rb: Additional tests title case;
diff --git a/localeinit.c b/localeinit.c
index c4dda819b7..6563a6f90a 100644
--- a/localeinit.c
+++ b/localeinit.c
@@ -89,7 +89,7 @@ enc_find_index(const char *name)
}
int
-rb_locale_charmap_index(VALUE klass)
+rb_locale_charmap_index(void)
{
return (int)locale_charmap(enc_find_index);
}