Commits

Ken Takata committed b2daa84

add a new patch: fix-ruby20-x64.patch

Comments (0)

Files changed (2)

fix-ruby20-x64.patch

+diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
+--- a/src/Make_cyg.mak
++++ b/src/Make_cyg.mak
+@@ -234,18 +234,26 @@
+ ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),)
+ RUBY_PLATFORM = i386-mingw32
+ else
++ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/x64-mingw32),)
++RUBY_PLATFORM = x64-mingw32
++else
+ RUBY_PLATFORM = i386-mswin32
+ endif
+ endif
+ endif
++endif
+ 
+ ifndef RUBY_INSTALL_NAME
+ ifeq ($(RUBY_VER), 16)
+ RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
+ else
++ifeq ($(ARCH),x86-64)
++RUBY_INSTALL_NAME = x64-msvcrt-ruby$(RUBY_API_VER)
++else
+ RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER)
+ endif
+ endif
++endif
+ 
+ ifeq (19, $(word 1,$(sort 19 $(RUBY_VER))))
+ RUBY_19_OR_LATER = 1
+diff --git a/src/Make_ming.mak b/src/Make_ming.mak
+--- a/src/Make_ming.mak
++++ b/src/Make_ming.mak
+@@ -297,18 +297,26 @@
+ ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/i386-mingw32),)
+ RUBY_PLATFORM = i386-mingw32
+ else
++ifneq ($(wildcard $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/x64-mingw32),)
++RUBY_PLATFORM = x64-mingw32
++else
+ RUBY_PLATFORM = i386-mswin32
+ endif
+ endif
+ endif
++endif
+ 
+ ifndef RUBY_INSTALL_NAME
+ ifeq ($(RUBY_VER), 16)
+ RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_API_VER)
+ else
++ifeq ($(ARCH),x86-64)
++RUBY_INSTALL_NAME = x64-msvcrt-ruby$(RUBY_API_VER)
++else
+ RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_API_VER)
+ endif
+ endif
++endif
+ 
+ ifeq (19, $(word 1,$(sort 19 $(RUBY_VER))))
+ RUBY_19_OR_LATER = 1
+diff --git a/src/if_ruby.c b/src/if_ruby.c
+--- a/src/if_ruby.c
++++ b/src/if_ruby.c
+@@ -358,7 +358,7 @@
+ {
+     return dll_rb_float_new(d);
+ }
+-unsigned long rb_num2ulong(VALUE x)
++VALUE rb_num2ulong(VALUE x)
+ {
+     return (long)RSHIFT((SIGNED_VALUE)(x),1);
+ }
 gfw-bold-italic.patch
 cpo-N.diff
 fix-ruby20-msvc.patch
+fix-ruby20-x64.patch