@@ -11,12 +11,12 @@ begin # http://ph7spot.com/articles/system_timer # We don't want to bother trying to load SystemTimer on jruby and # ruby 1.9+. - if !defined?(RUBY_ENGINE) - require 'system_timer' - MemCacheTimer = SystemTimer - else + if defined?(JRUBY_VERSION) || (RUBY_VERSION >= '1.9') require 'timeout' MemCacheTimer = Timeout + else + require 'system_timer' + MemCacheTimer = SystemTimer end rescue LoadError => e puts "[memcache-client] Could not load SystemTimer gem, falling back to Ruby's slower/unsafe timeout library: #{e.message}" lib/memcache.rb d5ae15d362c379c3a6692e2d5b9beae545392cba Mike Perham mperham mperham@gmail.com http://github.com/mperham/memcache-client/commit/4b9f97fb793595000bf2b9a51cd0404f2d1c370e 4b9f97fb793595000bf2b9a51cd0404f2d1c370e 2009-05-05T11:20:16-07:00 2009-05-05T11:20:16-07:00 Update load logic to support REE (which defines RUBY_ENGINE) 45a28667c6b58d8b5366b3b05f6df9db1fb922de Mike Perham mperham mperham@gmail.com