ffi 1.8.1-x86-mingw32 → 1.9.0-x86-mingw32

data/Rakefile

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rubygems/package_task'
 require 'rubygems/tasks'
 require 'rbconfig'
+require 'rake/clean'
 
 USE_RAKE_COMPILER = (RUBY_PLATFORM =~ /java/) ? false : true
 if USE_RAKE_COMPILER
@@ -197,7 +198,7 @@ if USE_RAKE_COMPILER
 
     task "copy:ffi_c:x64-mingw32:#{ruby_version}" do |t|
       if File.exists?("#{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so")
-        sh "x86_64-w64-mingw32-strip -S #{dir}/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
+        sh "x86_64-w64-mingw32-strip -S #{BUILD_DIR}/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
       end
     end
   end

data/ext/ffi_c/ClosurePool.c

@@ -21,7 +21,7 @@
 #include <sys/param.h>
 #endif
 #include <sys/types.h>
-#ifndef _WIN32
+#if defined(__CYGWIN__) || !defined(_WIN32)
 #  include <sys/mman.h>
 #endif
 #include <stdio.h>
@@ -32,7 +32,7 @@
 # include "win32/stdbool.h"
 # include "win32/stdint.h"
 #endif
-#ifndef _WIN32
+#if defined(__CYGWIN__) || !defined(_WIN32)
 #  include <unistd.h>
 #else
 #  include <winsock2.h>
@@ -225,7 +225,7 @@ rbffi_Closure_CodeAddress(Closure* handle)
 static long
 getPageSize()
 {
-#if defined(_WIN32) || defined(__WIN32__)
+#if !defined(__CYGWIN__) && (defined(_WIN32) || defined(__WIN32__))
     SYSTEM_INFO si;
     GetSystemInfo(&si);
     return si.dwPageSize;
@@ -237,7 +237,7 @@ getPageSize()
 static void*
 allocatePage(void)
 {
-#if defined(_WIN32) || defined(__WIN32__)
+#if !defined(__CYGWIN__) && (defined(_WIN32) || defined(__WIN32__))
     return VirtualAlloc(NULL, pageSize, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 #else
     caddr_t page = mmap(NULL, pageSize, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
@@ -248,7 +248,7 @@ allocatePage(void)
 static bool
 freePage(void *addr)
 {
-#if defined(_WIN32) || defined(__WIN32__)
+#if !defined(__CYGWIN__) && (defined(_WIN32) || defined(__WIN32__))
     return VirtualFree(addr, 0, MEM_RELEASE);
 #else
     return munmap(addr, pageSize) == 0;
@@ -258,7 +258,7 @@ freePage(void *addr)
 static bool
 protectPage(void* page)
 {
-#if defined(_WIN32) || defined(__WIN32__)
+#if !defined(__CYGWIN__) && (defined(_WIN32) || defined(__WIN32__))
     DWORD oldProtect;
     return VirtualProtect(page, pageSize, PAGE_EXECUTE_READ, &oldProtect);
 #else

data/ext/ffi_c/Thread.c

@@ -25,7 +25,7 @@
 # include "win32/stdint.h"
 #endif
 
-#ifndef _WIN32
+#if defined(__CYGWIN__) || !defined(_WIN32)
 # include <pthread.h>
 # include <errno.h>
 # include <signal.h>

data/ext/ffi_c/extconf.rb

@@ -36,7 +36,6 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
 
   create_header
   
-  $CFLAGS << " -mwin32 " if RbConfig::CONFIG['host_os'] =~ /cygwin/
   $LOCAL_LIBS << " ./libffi/.libs/libffi_convenience.lib" if RbConfig::CONFIG['host_os'] =~ /mswin/
 
   create_makefile("ffi_c")

data/lib/ffi/platform/i386-openbsd/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

data/lib/ffi/platform/x86_64-openbsd/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

data/lib/ffi/version.rb

@@ -1,4 +1,4 @@
 module FFI
-  VERSION = '1.8.1'
+  VERSION = '1.9.0'
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ffi
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 1
-  - 8
-  - 1
-  version: 1.8.1
+  - 9
+  - 0
+  version: 1.9.0
 platform: x86-mingw32
 authors: 
 - Wayne Meissner
@@ -15,9 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-23 00:00:00 Z
+date: 2013-06-10 00:00:00 +10:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -29,9 +31,9 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: rake
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: rake-compiler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,9 +47,9 @@ dependencies:
         - 0
         version: 0.6.0
   type: :development
-  name: rake-compiler
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -59,9 +61,9 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: rspec
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: rubygems-tasks
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -73,7 +75,6 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  name: rubygems-tasks
   version_requirements: *id004
 description: Ruby FFI library
 email: wmeissner@gmail.com
@@ -436,12 +437,12 @@ files:
 - lib/ffi/platform/i386-cygwin/types.conf
 - lib/ffi/platform/i386-darwin/types.conf
 - lib/ffi/platform/i386-freebsd/types.conf
+- lib/ffi/platform/i386-gnu/types.conf
 - lib/ffi/platform/i386-linux/types.conf
 - lib/ffi/platform/i386-netbsd/types.conf
 - lib/ffi/platform/i386-openbsd/types.conf
 - lib/ffi/platform/i386-solaris/types.conf
 - lib/ffi/platform/i386-windows/types.conf
-- lib/ffi/platform/i486-gnu/types.conf
 - lib/ffi/platform/ia64-linux/types.conf
 - lib/ffi/platform/mips-linux/types.conf
 - lib/ffi/platform/mipsel-linux/types.conf
@@ -526,6 +527,7 @@ files:
 - lib/1.8/ffi_c.so
 - lib/1.9/ffi_c.so
 - lib/2.0/ffi_c.so
+has_rdoc: true
 homepage: http://wiki.github.com/ffi/ffi
 licenses: 
 - LGPL-3
@@ -559,7 +561,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby FFI