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

various Windows OpenJDK 7 fixes

Browse Source
This commit is contained in:
Joel Dice 2012-03-17 18:47:22 -06:00
parent 75b5d3df4a
commit 0167868797
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefile
View File

@ -387,7 +387,6 @@ ifeq ($(platform),windows)
lflags = -L$(lib) $(common-lflags) -lws2_32 -liphlpapi -mwindows -mconsole lflags = -L$(lib) $(common-lflags) -lws2_32 -liphlpapi -mwindows -mconsole
cflags = -I$(inc) $(common-cflags) -DWINVER=0x0500 -DTARGET_PLATFORM_WINDOWS cflags = -I$(inc) $(common-cflags) -DWINVER=0x0500 -DTARGET_PLATFORM_WINDOWS
ifeq (,$(filter mingw32 cygwin,$(build-platform))) ifeq (,$(filter mingw32 cygwin,$(build-platform)))
openjdk-extra-cflags += -I$(src)/openjdk/caseSensitive openjdk-extra-cflags += -I$(src)/openjdk/caseSensitive
cxx = x86_64-w64-mingw32-g++ -m32 cxx = x86_64-w64-mingw32-g++ -m32
@ -425,6 +424,8 @@ ifeq ($(platform),windows)
strip = x86_64-w64-mingw32-strip strip = x86_64-w64-mingw32-strip
inc = "$(win64)/include" inc = "$(win64)/include"
lib = "$(win64)/lib" lib = "$(win64)/lib"
else
shared += -Wl,--add-stdcall-alias
endif endif
endif endif

1
openjdk-src.mk
View File

@ -203,6 +203,7 @@ ifeq ($(platform),windows)
$(openjdk-src)/windows/native/sun/nio/ch/DatagramChannelImpl.c \ $(openjdk-src)/windows/native/sun/nio/ch/DatagramChannelImpl.c \
$(openjdk-src)/windows/native/sun/nio/ch/DatagramDispatcher.c \ $(openjdk-src)/windows/native/sun/nio/ch/DatagramDispatcher.c \
$(openjdk-src)/windows/native/sun/nio/ch/FileChannelImpl.c \ $(openjdk-src)/windows/native/sun/nio/ch/FileChannelImpl.c \
$(openjdk-src)/windows/native/sun/nio/ch/FileDispatcherImpl.c \
$(openjdk-src)/windows/native/sun/nio/ch/FileKey.c \ $(openjdk-src)/windows/native/sun/nio/ch/FileKey.c \
$(openjdk-src)/windows/native/sun/nio/ch/IOUtil.c \ $(openjdk-src)/windows/native/sun/nio/ch/IOUtil.c \
$(openjdk-src)/windows/native/sun/nio/ch/Net.c \ $(openjdk-src)/windows/native/sun/nio/ch/Net.c \

4
src/classpath-openjdk.cpp
View File

@ -3863,7 +3863,7 @@ EXPORT(JVM_FindClassFromClassLoader)(Thread* t, const char* name,
} }
extern "C" JNIEXPORT jclass JNICALL extern "C" JNIEXPORT jclass JNICALL
EXPORT(JVM_FindClassFromBootLoader)(Thread* t, const char* name) JVM_FindClassFromBootLoader(Thread* t, const char* name)
{ {
return EXPORT(JVM_FindClassFromClassLoader)(t, name, false, 0, false); return EXPORT(JVM_FindClassFromClassLoader)(t, name, false, 0, false);
} }
@ -5344,7 +5344,7 @@ EXPORT(JVM_CX8Field)(JNIEnv*, jobject*, jfieldID*, jlong, jlong)
{ abort(); } { abort(); }
extern "C" JNIEXPORT void JNICALL extern "C" JNIEXPORT void JNICALL
JVM_SetNativeThreadName(JNIEnv*, jobject, jstring) { abort(); } EXPORT(JVM_SetNativeThreadName)(JNIEnv*, jobject, jstring) { abort(); }
} // namespace local } // namespace local