Use auto-layout if running on ruby 1.9

git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@7999 961051c9-f516-0410-bf72-c9f7e237a7b7
pjenvey · Nov 4, 2008 · 350ab0e · 350ab0e
1 parent 922fd0c
commit 350ab0e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/samples/ffi/gettimeofday.rb b/samples/ffi/gettimeofday.rb
@@ -1,8 +1,12 @@
 require 'rubygems'
 require 'ffi'
 class Timeval < FFI::Struct
-#  layout :tv_sec => :ulong, :tv_usec => :ulong
-  layout :tv_sec, :ulong, 0, :tv_usec, :ulong, 4
+  rb_maj, rb_min, rb_micro = RUBY_VERSION.split('.')
+  if rb_maj.to_i >= 1 && rb_min.to_i >= 9 || RUBY_PLATFORM =~ /java/
+    layout :tv_sec => :ulong, :tv_usec => :ulong
+  else
+    layout :tv_sec, :ulong, 0, :tv_usec, :ulong, 4
+  end
 end
 module LibC
   extend FFI::Library