ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix native Windows GCC 3.4 build

Browse Source
This commit is contained in:
Joel Dice 2010-11-12 16:53:16 -07:00
parent 8ca5e9780e
commit 26a59612bb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -233,7 +233,7 @@ ifeq ($(platform),windows)
# ranlib = i586-mingw32msvc-ranlib # ranlib = i586-mingw32msvc-ranlib
# strip = i586-mingw32msvc-strip # strip = i586-mingw32msvc-strip
else else
build-platform = windows build-system = windows
common-cflags += "-I$(JAVA_HOME)/include/win32" common-cflags += "-I$(JAVA_HOME)/include/win32"
build-cflags = $(common-cflags) -I$(src) -mthreads build-cflags = $(common-cflags) -I$(src) -mthreads
ifeq ($(build-platform),cygwin) ifeq ($(build-platform),cygwin)

4
src/compile.cpp
View File

@ -6134,8 +6134,8 @@ compileVirtualMethod(MyThread* t)
uint64_t uint64_t
invokeNativeFast(MyThread* t, object method, void* function) invokeNativeFast(MyThread* t, object method, void* function)
{ {
return reinterpret_cast<FastNativeFunction>(function) FastNativeFunction f; memcpy(&f, &function, sizeof(void*));
(t, method, return f(t, method,
static_cast<uintptr_t*>(t->stack) static_cast<uintptr_t*>(t->stack)
+ t->arch->frameFooterSize() + t->arch->frameFooterSize()
+ t->arch->frameReturnAddressSize()); + t->arch->frameReturnAddressSize());