summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-12 16:37:49 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-12 16:37:49 +0000
commit03efb12af2fe3f0950fbe2e62ea7bbd09a03a20e (patch)
treefd3f129ca6d171baca3f024a09e107f3695c28fa /ext
parent6fcf972c20996843226482ec427485979a1a26dc (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
Diffstat (limited to 'ext')
-rw-r--r--ext/dl/lib/dl.rb2
1 files changed, 1 insertions, 1 deletions
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