summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlamont-granquist <lamont@scriptkiddie.org>2014-09-25 08:32:09 -0700
committerlamont-granquist <lamont@scriptkiddie.org>2014-09-25 08:32:09 -0700
commitc5d0f4c89fa5a493fd9638d232f70088b4d0556e (patch)
treeebdba8fb78f7e269a7ed42c628d3545de8f52362
parenteb5d36fb57f6f64e1ea4dc1e27e7715b4a8bc3ed (diff)
parent767ce17216401b1ff07c2ebc57c01cc23a59f7b1 (diff)
downloadffi-yajl-c5d0f4c89fa5a493fd9638d232f70088b4d0556e.tar.gz
Merge pull request #13 from opscode/lcg/rbconfig
Lcg/rbconfig
-rw-r--r--CHANGELOG.md2
-rw-r--r--lib/ffi_yajl/ext.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b5a916..59eb314 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
### Bugs fixed
+* Change Config to RbConfig for FFI-based dlopen for non-DL/non-Fiddle fallback.
+
## 1.1.0 (08/26/2014)
### New features
diff --git a/lib/ffi_yajl/ext.rb b/lib/ffi_yajl/ext.rb
index 1441cba..b645972 100644
--- a/lib/ffi_yajl/ext.rb
+++ b/lib/ffi_yajl/ext.rb
@@ -48,7 +48,7 @@ module FFI_Yajl
extend ::FFI::Library
ffi_lib 'dl'
attach_function 'dlopen', :dlopen, [:string, :int], :void
- if Config::CONFIG['host_os'] =~ /linux/i
+ if RbConfig::CONFIG['host_os'] =~ /linux/i
dlopen libpath, 0x102 # linux: RTLD_GLOBAL | RTLD_NOW
else
dlopen libpath, 0