tenderlove	2010-05-09 02:59:46 +0900 (Sun, 09 May 2010)

  New Revision: 27685

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

  Log:
    * ext/fiddle/lib/fiddle.rb: only require DL if it hasn't been required
      yet. [ruby-core:30095]

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27684)
+++ ChangeLog	(revision 27685)
@@ -1,3 +1,8 @@
+Sun May  9 02:57:02 2010  Aaron Patterson <aaron@t...>
+
+	* ext/fiddle/lib/fiddle.rb: only require DL if it hasn't been required
+	  yet. [ruby-core:30095]
+
 Sun May  9 01:15:18 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* cont.c (stackgrowdirection): removed duplicated code, use
Index: ext/fiddle/lib/fiddle.rb
===================================================================
--- ext/fiddle/lib/fiddle.rb	(revision 27684)
+++ ext/fiddle/lib/fiddle.rb	(revision 27685)
@@ -1,7 +1,7 @@
 require 'fiddle.so'
 require 'fiddle/function'
 require 'fiddle/closure'
-require 'dl'
+require 'dl' unless Object.const_defined?(:DL)
 
 module Fiddle
   Pointer = DL::CPtr

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