From b610cec7373fe8c36a1582e243f46f18d18ba701 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 9 May 2010 03:10:13 +0000
Subject: [PATCH] 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]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 5 +++++
 ext/fiddle/lib/fiddle.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d4211d6025..498c740f08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May  9 02:57:02 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* 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@ruby-lang.org>
 
 	* ext/json/{generator/generator.c,parser/parser.rl}: fixed indent.
diff --git a/ext/fiddle/lib/fiddle.rb b/ext/fiddle/lib/fiddle.rb
index bc4017eee0..8b8c069b03 100644
--- a/ext/fiddle/lib/fiddle.rb
+++ b/ext/fiddle/lib/fiddle.rb
@@ -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