mirror of
https://github.com/corda/corda.git
synced 2025-01-01 02:36:44 +00:00
fix native Windows GCC 3.4 build
This commit is contained in:
parent
8ca5e9780e
commit
26a59612bb
2
makefile
2
makefile
@ -233,7 +233,7 @@ ifeq ($(platform),windows)
|
||||
# ranlib = i586-mingw32msvc-ranlib
|
||||
# strip = i586-mingw32msvc-strip
|
||||
else
|
||||
build-platform = windows
|
||||
build-system = windows
|
||||
common-cflags += "-I$(JAVA_HOME)/include/win32"
|
||||
build-cflags = $(common-cflags) -I$(src) -mthreads
|
||||
ifeq ($(build-platform),cygwin)
|
||||
|
@ -6134,11 +6134,11 @@ compileVirtualMethod(MyThread* t)
|
||||
uint64_t
|
||||
invokeNativeFast(MyThread* t, object method, void* function)
|
||||
{
|
||||
return reinterpret_cast<FastNativeFunction>(function)
|
||||
(t, method,
|
||||
static_cast<uintptr_t*>(t->stack)
|
||||
+ t->arch->frameFooterSize()
|
||||
+ t->arch->frameReturnAddressSize());
|
||||
FastNativeFunction f; memcpy(&f, &function, sizeof(void*));
|
||||
return f(t, method,
|
||||
static_cast<uintptr_t*>(t->stack)
|
||||
+ t->arch->frameFooterSize()
|
||||
+ t->arch->frameReturnAddressSize());
|
||||
}
|
||||
|
||||
uint64_t
|
||||
|
Loading…
Reference in New Issue
Block a user