ffi 1.4.0-x86-mingw32 → 1.4.1.dev-x86-mingw32

data/Rakefile

@@ -165,7 +165,7 @@ task 'spec:specdoc' => TEST_DEPS
 task :default => :specs
 
 task 'gem:win32' do
-  sh("rake cross native gem RUBY_CC_VERSION='1.8.7:1.9.3'") || raise("win32 build failed!")
+  sh("rake cross native gem RUBY_CC_VERSION='1.8.7:1.9.3:2.0.0'") || raise("win32 build failed!")
 end
 
 

data/ext/ffi_c/Function.c

@@ -26,6 +26,7 @@
 #include <sys/types.h>
 #ifndef _WIN32
 # include <sys/mman.h>
+# include <unistd.h>
 #endif
 #include <stdio.h>
 #ifndef _MSC_VER
@@ -460,7 +461,7 @@ callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data)
 
     if (rbffi_thread_has_gvl_p()) {
         rbffi_active_thread.exc = Qnil;
-        rb_rescue2(callback_with_gvl, &cb, save_callback_exception, &cb, rb_eException, (VALUE) 0);
+        rb_rescue2(callback_with_gvl, (VALUE) &cb, save_callback_exception, (VALUE) &cb, rb_eException, (VALUE) 0);
     
 #if defined(DEFER_ASYNC_CALLBACK) && !defined(_WIN32)
     } else {

data/ext/ffi_c/FunctionInfo.c

@@ -171,7 +171,7 @@ fntype_initialize(int argc, VALUE* argv, VALUE self)
     fnInfo->ffiReturnType = fnInfo->returnType->ffiType;
 
 
-#if defined(_WIN32) || defined(__WIN32__)
+#if (defined(_WIN32) || defined(__WIN32__)) && defined(FFI_STDCALL) 
     rbConventionStr = (rbConvention != Qnil) ? rb_funcall2(rbConvention, rb_intern("to_s"), 0, NULL) : Qnil;
     fnInfo->abi = (rbConventionStr != Qnil && strcmp(StringValueCStr(rbConventionStr), "stdcall") == 0)
             ? FFI_STDCALL : FFI_DEFAULT_ABI;

data/ext/ffi_c/Thread.c

@@ -30,6 +30,7 @@ typedef int bool;
 # include <pthread.h>
 # include <errno.h>
 # include <signal.h>
+# include <unistd.h>
 #else
 # include <winsock2.h>
 # define _WINSOCKAPI_

data/ext/ffi_c/Variadic.c

@@ -107,7 +107,7 @@ variadic_initialize(VALUE self, VALUE rbFunction, VALUE rbParameterTypes, VALUE
     invoker->rbAddress = rbFunction;
     invoker->function = rbffi_AbstractMemory_Cast(rbFunction, rbffi_PointerClass)->address;
 
-#if defined(_WIN32) || defined(__WIN32__)
+#if (defined(_WIN32) || defined(__WIN32__)) && defined(FFI_STDCALL)
     rbConventionStr = rb_funcall2(convention, rb_intern("to_s"), 0, NULL);
     invoker->abi = (RTEST(convention) && strcmp(StringValueCStr(rbConventionStr), "stdcall") == 0)
             ? FFI_STDCALL : FFI_DEFAULT_ABI;

data/ext/ffi_c/extconf.rb

@@ -7,9 +7,11 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
 
   # recent versions of ruby add restrictive ansi and warning flags on a whim - kill them all
   $warnflags = ''
-  $CFLAGS.gsub!(/-ansi/, '')
-  $CFLAGS.gsub!(/-std=[^\s]+/, '')
-
+  $CFLAGS.gsub!(/[\s+]-ansi/, '')
+  $CFLAGS.gsub!(/[\s+]-std=[^\s]+/, '')
+  # solaris needs -c99 for <stdbool.h>
+  $CFLAGS << " -std=c99" if RbConfig::CONFIG['host_os'] =~ /solaris/
+  
   if ENV['RUBY_CC_VERSION'].nil? && (pkg_config("libffi") ||
      have_header("ffi.h") ||
      find_header("ffi.h", "/usr/local/include", "/usr/include/ffi"))

data/ffi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'ffi'
-  s.version = '1.4.0'
+  s.version = '1.4.1.dev'
   s.author = 'Wayne Meissner'
   s.email = 'wmeissner@gmail.com'
   s.homepage = 'http://wiki.github.com/ffi/ffi'

data/lib/ffi/platform/x86_64-freebsd/types.conf

@@ -82,6 +82,8 @@ rbx.platform.typedef.int32_t = int
 rbx.platform.typedef.uint32_t = uint
 rbx.platform.typedef.int64_t = long_long
 rbx.platform.typedef.uint64_t = ulong_long
+rbx.platform.typedef.intptr_t = long
+rbx.platform.typedef.uintptr_t = ulong
 rbx.platform.typedef.u_int8_t = uchar
 rbx.platform.typedef.u_int16_t = ushort
 rbx.platform.typedef.u_int32_t = uint

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ffi
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  hash: 1824508225
+  prerelease: 6
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  - dev
+  version: 1.4.1.dev
 platform: x86-mingw32
 authors: 
 - Wayne Meissner
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-21 00:00:00 Z
+date: 2013-03-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -506,6 +507,7 @@ files:
 - libtest/VariadicTest.c
 - lib/1.8/ffi_c.so
 - lib/1.9/ffi_c.so
+- lib/2.0/ffi_c.so
 homepage: http://wiki.github.com/ffi/ffi
 licenses: 
 - LGPL-3
@@ -529,12 +531,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: