MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ruby: try to fix msvc build (use fastcall for thiscall fptr)

develop
jj 2012-06-14 14:25:16 +02:00
parent 2781723f7b
commit 6bd67cc055
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/ruby/ruby.cpp
Unescape Escape View File

@ -763,13 +763,18 @@ static VALUE rb_dfmemory_bitarray_set(VALUE self, VALUE addr, VALUE idx, VALUE v
static VALUE rb_dfvcall(VALUE self, VALUE cppobj, VALUE cppvoff, VALUE a0, VALUE a1, VALUE a2, VALUE a3) static VALUE rb_dfvcall(VALUE self, VALUE cppobj, VALUE cppvoff, VALUE a0, VALUE a1, VALUE a2, VALUE a3)
{ {
#ifdef WIN32 #ifdef WIN32
__thiscall int (__fastcall *fptr)(char **me, int dummy_edx, int, int, int, int);
#endif #else
int (*fptr)(char **me, int, int, int, int); int (*fptr)(char **me, int, int, int, int);
#endif
char **that = (char**)rb_num2ulong(cppobj); char **that = (char**)rb_num2ulong(cppobj);
int ret; int ret;
fptr = (decltype(fptr))*(void**)(*that + rb_num2ulong(cppvoff)); fptr = (decltype(fptr))*(void**)(*that + rb_num2ulong(cppvoff));
ret = fptr(that, rb_num2ulong(a0), rb_num2ulong(a1), rb_num2ulong(a2), rb_num2ulong(a3)); ret = fptr(that,
#ifdef WIN32
0,
#endif
rb_num2ulong(a0), rb_num2ulong(a1), rb_num2ulong(a2), rb_num2ulong(a3));
return rb_int2inum(ret); return rb_int2inum(ret);
} }