yugui	2010-05-09 12:10:13 +0900 (Sun, 09 May 2010)

  New Revision: 27696

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

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

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

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27695)
+++ ruby_1_9_2/ChangeLog	(revision 27696)
@@ -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 09:30:09 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/json/{generator/generator.c,parser/parser.rl}: fixed indent.
Index: ruby_1_9_2/ext/fiddle/lib/fiddle.rb
===================================================================
--- ruby_1_9_2/ext/fiddle/lib/fiddle.rb	(revision 27695)
+++ ruby_1_9_2/ext/fiddle/lib/fiddle.rb	(revision 27696)
@@ -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/