aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-12 15:28:47 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-12 15:28:47 +0000
commit75033ea16f86679164eac5030c230ca50d86d1cf (patch)
tree0849defe1b1eaa13c84bf64a9ad0344cdcf72fdc
parent2be632476e8f2b3db28e463ca7b1a2c0cf0f83b7 (diff)
downloadruby-75033ea16f86679164eac5030c230ca50d86d1cf.tar.gz
* ext/dl/lib/dl.rb: don't require when already loaded.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/dl/lib/dl.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9503a99c7c..5089c4b04d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 13 00:27:24 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/dl/lib/dl.rb: don't require when already loaded.
+
Sun Jun 13 00:02:56 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