diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-08 17:59:46 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-08 17:59:46 +0000 |
| commit | 1684c2349668e6d8fb2491f209ba7eb9f875e560 (patch) | |
| tree | 1f5750a3283b4e1708cb4b41f68e01e12e14fe35 | |
| parent | 69a0084541034a9b62e635091b3d489bae0fc407 (diff) | |
| download | ruby-1684c2349668e6d8fb2491f209ba7eb9f875e560.tar.gz | |
* 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/trunk@27685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/fiddle/lib/fiddle.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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 01:15:18 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * cont.c (stackgrowdirection): removed duplicated code, use 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 |