1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

load.c (ruby_init_ext): make idempotent to suppress warnings

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2014-03-02 01:49:15 +00:00
parent 9db0dd7bb9
commit 8120b18862
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sun Mar 2 10:47:58 2014 Eric Wong <e@80x24.org>
* load.c (ruby_init_ext): make idempotent to suppress warnings
Sat Mar 1 19:51:42 2014 Tanaka Akira <akr@fsij.org> Sat Mar 1 19:51:42 2014 Tanaka Akira <akr@fsij.org>
* lib/open3.rb (Open3.capture3): Ignore Errno::EPIPE for writing * lib/open3.rb (Open3.capture3): Ignore Errno::EPIPE for writing

3
load.c
View File

@ -1059,10 +1059,13 @@ ruby_init_ext(const char *name, void (*init)(void))
{ {
st_table *loading_tbl = get_loading_table(); st_table *loading_tbl = get_loading_table();
if (rb_provided(name))
return;
if (!loading_tbl) { if (!loading_tbl) {
GET_VM()->loading_table = loading_tbl = st_init_strtable(); GET_VM()->loading_table = loading_tbl = st_init_strtable();
} }
st_update(loading_tbl, (st_data_t)name, register_init_ext, (st_data_t)init); st_update(loading_tbl, (st_data_t)name, register_init_ext, (st_data_t)init);
rb_provide(name);
} }
/* /*