naruse	2010-06-13 00:28:47 +0900 (Sun, 13 Jun 2010)

  New Revision: 28302

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28302

  Log:
    * ext/dl/lib/dl.rb: don't require when already loaded.

  Modified files:
    trunk/ChangeLog
    trunk/ext/dl/lib/dl.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28301)
+++ ChangeLog	(revision 28302)
@@ -1,3 +1,7 @@
+Sun Jun 13 00:27:24 2010  NARUSE, Yui  <naruse@r...>
+
+	* ext/dl/lib/dl.rb: don't require when already loaded.
+
 Sun Jun 13 00:02:56 2010  NARUSE, Yui  <naruse@r...>
 
 	* ext/fiddle/closure.c (dealloc): workaround fix for libffi's
Index: ext/dl/lib/dl.rb
===================================================================
--- ext/dl/lib/dl.rb	(revision 28301)
+++ ext/dl/lib/dl.rb	(revision 28302)
@@ -1,7 +1,7 @@
 require 'dl.so'
 
 begin
-  require 'fiddle'
+  require 'fiddle' unless Object.const_defined?(:Fiddle)
 rescue LoadError
 end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/