summaryrefslogtreecommitdiffstats
path: root/ext/iconv
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-12 00:36:54 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-12 00:36:54 +0000
commitf47bdbc620155abd87a90d1bb0d4b59de38c3bf8 (patch)
tree821d252ade8e1942f20425e05a6708f0d8b5e57a /ext/iconv
parentd21469f63eb60b5c17fe3d96ce3e0da0fd2deab2 (diff)
downloadruby-f47bdbc620155abd87a90d1bb0d4b59de38c3bf8.tar.gz
ruby-f47bdbc620155abd87a90d1bb0d4b59de38c3bf8.tar.xz
ruby-f47bdbc620155abd87a90d1bb0d4b59de38c3bf8.zip
* ext/digest/digest.c (rb_digest_base_s_digest): add volatile to
protect temporary context object. [ruby-dev:27979] * ext/iconv/iconv.c (Init_iconv): rb_gc_register_address() should be called before actual variable initialization. [ruby-dev:27986] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/iconv')
-rw-r--r--ext/iconv/iconv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index a1aa484c6..cebbd912f 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -1083,8 +1083,8 @@ Init_iconv(void)
id_transliterate = rb_intern("transliterate");
id_discard_ilseq = rb_intern("discard_ilseq");
- charset_map = rb_hash_new();
rb_gc_register_address(&charset_map);
+ charset_map = rb_hash_new();
rb_define_singleton_method(rb_cIconv, "charset_map", charset_map_get, 0);
}