Use FFI:: Instead of JRuby::FFI:: where possible

git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@8199 961051c9-f516-0410-bf72-c9f7e237a7b7
enebo · Nov 29, 2008 · ea65b9a · ea65b9a
1 parent e2efb52
commit ea65b9a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/bench/ffi/bench_chmod.rb b/bench/ffi/bench_chmod.rb
@@ -11,7 +11,7 @@ def self.chmod(mode, path)
     if self._chmod(path, mode) != 0
     end
   end
-  if JRuby::FFI::Platform::IS_WINDOWS
+  if FFI::Platform.windows?
     attach_function :_chmod, :_chmod, [ :string, :int ], :int
   else
     attach_function :_chmod, :chmod, [ :string, :int ], :int

diff --git a/bench/ffi/bench_memchr.rb b/bench/ffi/bench_memchr.rb
@@ -2,18 +2,18 @@
 require 'ffi'
 iter = 10000
 str = "test" * 1000
-module JLibC
+module LibC
   extend FFI::Library
   attach_function :memchr, [ :string, :char, :int ], :pointer
 end
 
-if JLibC.memchr("test", 't', 4).nil?
-  raise ArgumentError, "JRuby::FFI.memchr returned incorrect value"
+if LibC.memchr("test", 't', 4).nil?
+  raise ArgumentError, "FFI memchr returned incorrect value"
 end
 
 puts "Benchmark FFI memchr(3) performance, #{iter}x"
 10.times {
   puts Benchmark.measure {
-    iter.times { JLibC.memchr(str, 't', 4) }
+    iter.times { LibC.memchr(str, 't', 4) }
   }
 }
diff --git a/bench/ffi/bench_stat.rb b/bench/ffi/bench_stat.rb
@@ -10,7 +10,7 @@ module Posix
   extend FFI::Library
   attach_function :stat, [ :string, :pointer ], :int
 end
-class Stat < JRuby::FFI::Struct
+class Stat < FFI::Struct
   layout \
     :st_dev => :int,        # device inode resides on (dev_t)
     :st_ino => :int,        # inode's number (ino_t)

diff --git a/bench/ffi/bench_strlen.rb b/bench/ffi/bench_strlen.rb
@@ -3,18 +3,18 @@
 iter = 100000
 str = "test"
 
-module JLibC
+module LibC
   extend FFI::Library
   attach_function :strlen, [ :string ], :int
 end
 
-if JLibC.strlen("test") != 4
+if LibC.strlen("test") != 4
   raise ArgumentError, "jruby FFI.strlen returned incorrect value"
 end
 
 puts "Benchmark jruby FFI api strlen(3) performance, #{iter}x"
 10.times {
   puts Benchmark.measure {
-    iter.times { JLibC.strlen(str) }
+    iter.times { LibC.strlen(str) }
   }
 }