diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 17:22:04 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 17:22:04 +0000 |
commit | 50864b9d019e2dfd5fb43c5e4ea50917ba2d3f4a (patch) | |
tree | 6c1ec38446a8587525d84d471234246e154d1703 /localeinit.c | |
parent | 710fe14b5d1e00f9ae2d3fb49670b91a27dbe233 (diff) |
merge revision(s) 54256,54291,54292,54293: [Backport #12118] [Bug #12218]
* thread_pthread.c (reserve_stack): fix reserving position where
the stack growing bottom to top. [Bug #12118]
* localeinit.c (rb_locale_charmap_index): fix prototype.
patched by Andreas Schwab [Bug #12218]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'localeinit.c')
-rw-r--r-- | localeinit.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |