diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-12 16:37:49 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-12 16:37:49 +0000 |
| commit | 03efb12af2fe3f0950fbe2e62ea7bbd09a03a20e (patch) | |
| tree | fd3f129ca6d171baca3f024a09e107f3695c28fa | |
| parent | 6fcf972c20996843226482ec427485979a1a26dc (diff) | |
merge revision(s) 28302:
* ext/dl/lib/dl.rb: don't require when already loaded.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/dl/lib/dl.rb | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun Jun 13 01:37:40 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/dl/lib/dl.rb: don't require when already loaded. + Sun Jun 13 01:37:08 2010 NARUSE, Yui <naruse@ruby-lang.org> * ext/fiddle/closure.c (dealloc): workaround fix for libffi's diff --git a/ext/dl/lib/dl.rb b/ext/dl/lib/dl.rb index 168a18a55e..80d46b685a 100644 --- a/ext/dl/lib/dl.rb +++ b/ext/dl/lib/dl.rb @@ -1,7 +1,7 @@ require 'dl.so' begin - require 'fiddle' + require 'fiddle' unless Object.const_defined?(:Fiddle) rescue LoadError end |