summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-10-09 19:18:12 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2014-10-09 19:18:12 -0700
commit39a19644e678b7ac24808be203895f5f758a1e6d (patch)
tree864ca8f3c88dfac8f1af0242c221032227356995
parent376dbcb48e4131ab55f174d05c69dfda3c6c8f35 (diff)
downloadffi-yajl-39a19644e678b7ac24808be203895f5f758a1e6d.tar.gz
the c ext loads and still tests fine on 1.8.7
-rw-r--r--lib/ffi_yajl.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ffi_yajl.rb b/lib/ffi_yajl.rb
index 10ebb38..ce099e0 100644
--- a/lib/ffi_yajl.rb
+++ b/lib/ffi_yajl.rb
@@ -1,8 +1,7 @@
if ENV['FORCE_FFI_YAJL'] == "ext"
require 'ffi_yajl/ext'
-elsif ENV['FORCE_FFI_YAJL'] == "ffi" || defined?(Yajl) || RUBY_VERSION.to_f < 1.9
- # - can't dynlink our libyajl2 c-ext and Yajl's libyajl1 c-ext into the same binary
+elsif ENV['FORCE_FFI_YAJL'] == "ffi" || defined?(Yajl)
# - c-extension segfaults on ruby 1.8.7
require 'ffi_yajl/ffi'
else