Init functions should have prefix to avoid confliction.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60990 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

16 files changed, 16 insertions, 16 deletions

diff --git a/ext/-test-/string/capacity.c b/ext/-test-/string/capacity.c
index ba7fb85e9e..f5277bf4e6 100644
--- a/ext/-test-/string/capacity.c
+++ b/ext/-test-/string/capacity.c
@@ -11,7 +11,7 @@ bug_str_capacity(VALUE klass, VALUE str)
 }
 
 void
-Init_capacity(VALUE klass)
+Init_string_capacity(VALUE klass)
 {
     rb_define_singleton_method(klass, "capacity", bug_str_capacity, 1);
 }
diff --git a/ext/-test-/string/coderange.c b/ext/-test-/string/coderange.c
index b93172d72d..df83fb5d44 100644
--- a/ext/-test-/string/coderange.c
+++ b/ext/-test-/string/coderange.c
@@ -36,7 +36,7 @@ str_coderange_scan(VALUE str)
 }
 
 void
-Init_coderange(VALUE klass)
+Init_string_coderange(VALUE klass)
 {
     sym_7bit = ID2SYM(rb_intern("7bit"));
     sym_valid = ID2SYM(rb_intern("valid"));
diff --git a/ext/-test-/string/cstr.c b/ext/-test-/string/cstr.c
index fc47d5206f..2a41b932db 100644
--- a/ext/-test-/string/cstr.c
+++ b/ext/-test-/string/cstr.c
@@ -131,7 +131,7 @@ bug_str_s_rb_str_new_frozen(VALUE self, VALUE str)
 }
 
 void
-Init_cstr(VALUE klass)
+Init_string_cstr(VALUE klass)
 {
     rb_define_method(klass, "cstr_term", bug_str_cstr_term, 0);
     rb_define_method(klass, "cstr_unterm", bug_str_cstr_unterm, 1);
diff --git a/ext/-test-/string/ellipsize.c b/ext/-test-/string/ellipsize.c
index 0451519492..6034408724 100644
--- a/ext/-test-/string/ellipsize.c
+++ b/ext/-test-/string/ellipsize.c
@@ -7,7 +7,7 @@ bug_str_ellipsize(VALUE str, VALUE len)
 }
 
 void
-Init_ellipsize(VALUE klass)
+Init_string_ellipsize(VALUE klass)
 {
     rb_define_method(klass, "ellipsize", bug_str_ellipsize, 1);
 }
diff --git a/ext/-test-/string/enc_associate.c b/ext/-test-/string/enc_associate.c
index 53811620a0..594d8a43a4 100644
--- a/ext/-test-/string/enc_associate.c
+++ b/ext/-test-/string/enc_associate.c
@@ -15,7 +15,7 @@ bug_str_encoding_index(VALUE self, VALUE str)
 }
 
 void
-Init_enc_associate(VALUE klass)
+Init_string_enc_associate(VALUE klass)
 {
     rb_define_method(klass, "associate_encoding!", bug_str_enc_associate, 1);
     rb_define_singleton_method(klass, "encoding_index", bug_str_encoding_index, 1);
diff --git a/ext/-test-/string/enc_str_buf_cat.c b/ext/-test-/string/enc_str_buf_cat.c
index 5d583c65dc..9ac4a298be 100644
--- a/ext/-test-/string/enc_str_buf_cat.c
+++ b/ext/-test-/string/enc_str_buf_cat.c
@@ -8,7 +8,7 @@ enc_str_buf_cat(VALUE str, VALUE str2)
 }
 
 void
-Init_enc_str_buf_cat(VALUE klass)
+Init_string_enc_str_buf_cat(VALUE klass)
 {
     rb_define_method(klass, "enc_str_buf_cat", enc_str_buf_cat, 1);
 }
diff --git a/ext/-test-/string/fstring.c b/ext/-test-/string/fstring.c
index b65c98ce6d..30120b42f6 100644
--- a/ext/-test-/string/fstring.c
+++ b/ext/-test-/string/fstring.c
@@ -9,7 +9,7 @@ bug_s_fstring(VALUE self, VALUE str)
 }
 
 void
-Init_fstring(VALUE klass)
+Init_string_fstring(VALUE klass)
 {
     rb_define_singleton_method(klass, "fstring", bug_s_fstring, 1);
 }
diff --git a/ext/-test-/string/init.c b/ext/-test-/string/init.c
index 0b3e4a6ff2..a74245c8d7 100644
--- a/ext/-test-/string/init.c
+++ b/ext/-test-/string/init.c
@@ -1,6 +1,6 @@
 #include "ruby.h"
 
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+#define init(n) {void Init_string_##n(VALUE klass); Init_string_##n(klass);}
 
 void
 Init_string(void)
diff --git a/ext/-test-/string/modify.c b/ext/-test-/string/modify.c
index ddd2efd8f0..945febc7e3 100644
--- a/ext/-test-/string/modify.c
+++ b/ext/-test-/string/modify.c
@@ -15,7 +15,7 @@ bug_str_modify_expand(VALUE str, VALUE expand)
 }
 
 void
-Init_modify(VALUE klass)
+Init_string_modify(VALUE klass)
 {
     rb_define_method(klass, "modify!", bug_str_modify, 0);
     rb_define_method(klass, "modify_expand!", bug_str_modify_expand, 1);
diff --git a/ext/-test-/string/new.c b/ext/-test-/string/new.c
index 3b54eebefe..60625b8300 100644
--- a/ext/-test-/string/new.c
+++ b/ext/-test-/string/new.c
@@ -14,7 +14,7 @@ bug_external_str_new(VALUE self, VALUE len, VALUE enc)
 }
 
 void
-Init_new(VALUE klass)
+Init_string_new(VALUE klass)
 {
     rb_define_singleton_method(klass, "buf_new", bug_str_buf_new, 1);
     rb_define_singleton_method(klass, "external_new", bug_external_str_new, 2);
diff --git a/ext/-test-/string/nofree.c b/ext/-test-/string/nofree.c
index d3d8071ff9..fdf810c741 100644
--- a/ext/-test-/string/nofree.c
+++ b/ext/-test-/string/nofree.c
@@ -7,7 +7,7 @@ bug_str_nofree(VALUE self)
 }
 
 void
-Init_nofree(VALUE klass)
+Init_string_nofree(VALUE klass)
 {
     rb_define_singleton_method(klass, "nofree", bug_str_nofree, 0);
 }
diff --git a/ext/-test-/string/normalize.c b/ext/-test-/string/normalize.c
index 2e16a4616f..0ba1797631 100644
--- a/ext/-test-/string/normalize.c
+++ b/ext/-test-/string/normalize.c
@@ -11,7 +11,7 @@ normalize_ospath(VALUE str)
 #endif
 
 void
-Init_normalize(VALUE klass)
+Init_string_normalize(VALUE klass)
 {
     rb_define_method(klass, "normalize_ospath", normalize_ospath, 0);
 }
diff --git a/ext/-test-/string/qsort.c b/ext/-test-/string/qsort.c
index 0b34936d38..fb7ea3d8cb 100644
--- a/ext/-test-/string/qsort.c
+++ b/ext/-test-/string/qsort.c
@@ -55,7 +55,7 @@ bug_str_qsort_bang(int argc, VALUE *argv, VALUE str)
 }
 
 void
-Init_qsort(VALUE klass)
+Init_string_qsort(VALUE klass)
 {
     rb_define_method(klass, "qsort!", bug_str_qsort_bang, -1);
 }
diff --git a/ext/-test-/string/set_len.c b/ext/-test-/string/set_len.c
index 3c7d19d778..219cea404c 100644
--- a/ext/-test-/string/set_len.c
+++ b/ext/-test-/string/set_len.c
@@ -8,7 +8,7 @@ bug_str_set_len(VALUE str, VALUE len)
 }
 
 void
-Init_set_len(VALUE klass)
+Init_string_set_len(VALUE klass)
 {
     rb_define_method(klass, "set_len", bug_str_set_len, 1);
 }
diff --git a/ext/-test-/time/init.c b/ext/-test-/time/init.c
index 01a20b8b3d..91f8bf825b 100644
--- a/ext/-test-/time/init.c
+++ b/ext/-test-/time/init.c
@@ -1,6 +1,6 @@
 #include "ruby.h"
 
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
+#define init(n) {void Init_time_##n(VALUE klass); Init_time_##n(klass);}
 
 void
 Init_time(void)
diff --git a/ext/-test-/time/new.c b/ext/-test-/time/new.c
index 0f71a5542b..6f894417b6 100644
--- a/ext/-test-/time/new.c
+++ b/ext/-test-/time/new.c
@@ -26,7 +26,7 @@ bug_time_s_timespec_now(VALUE klass)
 }
 
 void
-Init_new(VALUE klass)
+Init_time_new(VALUE klass)
 {
     rb_define_singleton_method(klass, "nano_new", bug_time_s_nano_new, 2);
     rb_define_singleton_method(klass, "timespec_new", bug_time_s_timespec_new, 3);