diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2013-12-08 22:53:12 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2013-12-08 22:53:12 -0800 |
| commit | caf3c7c938dd9e6571cda04fd9cc0034d1b24626 (patch) | |
| tree | 0cc20f00cce60a3d1dc9f4857ade558806f3b0e0 /lib/ffi_yajl.rb | |
| parent | c84b1cca5c2bd19d33d1d0d82cbd7721127a0586 (diff) | |
| download | ffi-yajl-caf3c7c938dd9e6571cda04fd9cc0034d1b24626.tar.gz | |
simplify ext/ffi switching logic
Diffstat (limited to 'lib/ffi_yajl.rb')
| -rw-r--r-- | lib/ffi_yajl.rb | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/lib/ffi_yajl.rb b/lib/ffi_yajl.rb index b3a3901..a49de6a 100644 --- a/lib/ffi_yajl.rb +++ b/lib/ffi_yajl.rb @@ -53,13 +53,7 @@ module FFI_Yajl end end - if ENV['FORCE_FFI_YAJL'] == "ext" - require 'ffi_yajl/ext' - include FFI_Yajl::Ext::Encoder - elsif ENV['FORCE_FFI_YAJL'] == "ffi" - require 'ffi_yajl/ffi' - include FFI_Yajl::FFI::Encoder - elsif defined?(Yajl) + if ENV['FORCE_FFI_YAJL'] == "ffi" || defined?(Yajl) # on Linux yajl-ruby and non-FFI ffi_yajl conflict require 'ffi_yajl/ffi' include FFI_Yajl::FFI::Encoder @@ -93,13 +87,7 @@ module FFI_Yajl do_yajl_parse(str, yajl_opts) end - if ENV['FORCE_FFI_YAJL'] == "ext" - require 'ffi_yajl/ext' - include FFI_Yajl::Ext::Parser - elsif ENV['FORCE_FFI_YAJL'] == "ffi" - require 'ffi_yajl/ffi' - include FFI_Yajl::FFI::Parser - elsif defined?(Yajl) + if ENV['FORCE_FFI_YAJL'] == "ffi" || defined?(Yajl) # on Linux yajl-ruby and non-FFI ffi_yajl conflict require 'ffi_yajl/ffi' include FFI_Yajl::FFI::Parser |