From 4b1df2ae45a9f76b047db58c4df45432898f59c9 Mon Sep 17 00:00:00 2001 From: tenderlove Date: Tue, 30 Oct 2012 17:54:34 +0000 Subject: * ext/dl/lib/dl/struct.rb: fix strange require order. [ruby-dev:45702] * ext/dl/lib/dl/value.rb: ditto * test/dl/test_c_struct_entry.rb: remove strange require order from tests. * test/dl/test_c_union_entity.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/dl/lib/dl/struct.rb | 1 + ext/dl/lib/dl/value.rb | 2 ++ 2 files changed, 3 insertions(+) (limited to 'ext/dl/lib') diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb index db272081da..9359ca4fcc 100644 --- a/ext/dl/lib/dl/struct.rb +++ b/ext/dl/lib/dl/struct.rb @@ -1,4 +1,5 @@ require 'dl' +require 'dl/value' require 'dl/pack.rb' module DL diff --git a/ext/dl/lib/dl/value.rb b/ext/dl/lib/dl/value.rb index e99e3cf3bf..147d9d120a 100644 --- a/ext/dl/lib/dl/value.rb +++ b/ext/dl/lib/dl/value.rb @@ -46,6 +46,8 @@ module DL end def wrap_arg(arg, ty, funcs = [], &block) + require 'dl/func' + funcs ||= [] case arg when nil -- cgit v1.2.3