naruse	2010-06-13 01:37:49 +0900 (Sun, 13 Jun 2010)

  New Revision: 28304

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

  Log:
    merge revision(s) 28302:
    
    * ext/dl/lib/dl.rb: don't require when already loaded.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/dl/lib/dl.rb

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28303)
+++ ruby_1_9_2/ChangeLog	(revision 28304)
@@ -1,3 +1,7 @@
+Sun Jun 13 01:37:40 2010  NARUSE, Yui  <naruse@r...>
+
+	* ext/dl/lib/dl.rb: don't require when already loaded.
+
 Sun Jun 13 01:37:08 2010  NARUSE, Yui  <naruse@r...>
 
 	* ext/fiddle/closure.c (dealloc): workaround fix for libffi's
Index: ruby_1_9_2/ext/dl/lib/dl.rb
===================================================================
--- ruby_1_9_2/ext/dl/lib/dl.rb	(revision 28303)
+++ ruby_1_9_2/ext/dl/lib/dl.rb	(revision 28304)
@@ -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/