ffi 1.4.0 → 1.4.1.dev

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

@@ -9,7 +9,9 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   $warnflags = ''
   $CFLAGS.gsub!(/-ansi/, '')
   $CFLAGS.gsub!(/-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'

metadata

@@ -1,71 +1,70 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ffi
-version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: true
+  segments: 
+  - 1
+  - 4
+  - 1
+  - dev
+  version: 1.4.1.dev
 platform: ruby
-authors:
+authors: 
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-03-05 00:00:00 +10:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Ruby FFI library
 email: wmeissner@gmail.com
 executables: []
-extensions:
+
+extensions: 
 - ext/ffi_c/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - ffi.gemspec
 - History.txt
 - LICENSE
@@ -500,30 +499,40 @@ files:
 - libtest/StructTest.c
 - libtest/UnionTest.c
 - libtest/VariadicTest.c
+has_rdoc: true
 homepage: http://wiki.github.com/ffi/ffi
-licenses:
+licenses: 
 - LGPL-3
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
 - ext/ffi_c
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby FFI
 test_files: []
+