diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/fiddle/fiddle.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ext/fiddle/fiddle.c b/ext/fiddle/fiddle.c index 5f2bd5ae20..5635ab327c 100644 --- a/ext/fiddle/fiddle.c +++ b/ext/fiddle/fiddle.c @@ -142,6 +142,20 @@ Init_fiddle(void) rb_eFiddleError = rb_define_class_under(mFiddle, "Error", rb_eStandardError); /* + * Ruby installed by RubyInstaller for Windows always require + * bundled Fiddle because ruby_installer/runtime/dll_directory.rb + * requires Fiddle. It's used by + * rubygems/defaults/operating_system.rb. It means that the + * bundled Fiddle is always required on initialization. + * + * We just remove existing Fiddle::DLError here to override + * the bundled Fiddle. + */ + if (rb_const_defined(mFiddle, rb_intern("DLError"))) { + rb_const_remove(mFiddle, rb_intern("DLError")); + } + + /* * Document-class: Fiddle::DLError * * standard dynamic load exception |