summaryrefslogtreecommitdiff
path: root/ext/dl/lib/dl
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-30 17:54:34 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-30 17:54:34 +0000
commit4b1df2ae45a9f76b047db58c4df45432898f59c9 (patch)
tree8d5c585b9925ff3c9f1e3c3fcc28f8b978b0bb8e /ext/dl/lib/dl
parente46471e90c656b6a4c0e6c6846040e51448c2255 (diff)
* 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
Diffstat (limited to 'ext/dl/lib/dl')
-rw-r--r--ext/dl/lib/dl/struct.rb1
-rw-r--r--ext/dl/lib/dl/value.rb2
2 files changed, 3 insertions, 0 deletions
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb
index db272081daa..9359ca4fcc4 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 e99e3cf3bfd..147d9d120a7 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