ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-03 19:54:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #510 from dicej/master

Browse Source 
add missing Unsafe calls for recent JDK 7 updates
This commit is contained in:
Joel Dice 2016-11-08 17:27:09 -07:00 committed by GitHub
commit 01e11d8230
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefile
View File

@ -1588,6 +1588,7 @@ endif
ifeq (7,$(java-version))
test-sources := $(subst $(test)/InvokeDynamic.java,,$(test-sources))
test-sources := $(subst $(test)/Interfaces.java,,$(test-sources))
endif
test-cpp-sources = $(wildcard $(test)/*.cpp)
@ -2330,7 +2331,7 @@ ifeq ($(platform),windows)
echo 'static int getAddrsFromAdapter(IP_ADAPTER_ADDRESSES *ptr, netaddr **netaddrPP);' >> $(build)/openjdk/NetworkInterface.h
endif
ifeq ($(kernel),darwin)
ifeq ($(kernel),darwin)
mkdir -p $(build)/openjdk/netinet
for file in \
$(header-sysroot)/usr/include/netinet/ip.h \

12
src/classpath-openjdk.cpp
View File

@ -3134,6 +3134,18 @@ extern "C" AVIAN_EXPORT void JNICALL
release(t, reinterpret_cast<object>(arguments[1]));
}
extern "C" AVIAN_EXPORT jboolean JNICALL
Avian_sun_misc_Unsafe_isBigEndian0(Thread*, object, uintptr_t*)
{
return false;
}
extern "C" AVIAN_EXPORT jboolean JNICALL
Avian_sun_misc_Unsafe_unalignedAccess0(Thread*, object, uintptr_t*)
{
return false;
}
namespace {
namespace local {