From 0167868797bad47505512e413a886f77a8d63be6 Mon Sep 17 00:00:00 2001
From: Joel Dice <joel.dice@gmail.com>
Date: Sat, 17 Mar 2012 18:47:22 -0600
Subject: [PATCH] various Windows OpenJDK 7 fixes

---
 makefile                  | 3 ++-
 openjdk-src.mk            | 1 +
 src/classpath-openjdk.cpp | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/makefile b/makefile
index efa44b1769..53ca635f7f 100755
--- a/makefile
+++ b/makefile
@@ -387,7 +387,6 @@ ifeq ($(platform),windows)
 	lflags = -L$(lib) $(common-lflags) -lws2_32 -liphlpapi -mwindows -mconsole
 	cflags = -I$(inc) $(common-cflags) -DWINVER=0x0500 -DTARGET_PLATFORM_WINDOWS
 
-
 	ifeq (,$(filter mingw32 cygwin,$(build-platform)))
 		openjdk-extra-cflags += -I$(src)/openjdk/caseSensitive
 		cxx = x86_64-w64-mingw32-g++ -m32
@@ -425,6 +424,8 @@ ifeq ($(platform),windows)
 		strip = x86_64-w64-mingw32-strip
 		inc = "$(win64)/include"
 		lib = "$(win64)/lib"
+	else
+		shared += -Wl,--add-stdcall-alias
 	endif
 endif
 
diff --git a/openjdk-src.mk b/openjdk-src.mk
index 0c16a86a21..027b6a79b5 100644
--- a/openjdk-src.mk
+++ b/openjdk-src.mk
@@ -203,6 +203,7 @@ ifeq ($(platform),windows)
 		$(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/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/IOUtil.c \
 		$(openjdk-src)/windows/native/sun/nio/ch/Net.c \
diff --git a/src/classpath-openjdk.cpp b/src/classpath-openjdk.cpp
index 813870ad10..feb468b083 100644
--- a/src/classpath-openjdk.cpp
+++ b/src/classpath-openjdk.cpp
@@ -3863,7 +3863,7 @@ EXPORT(JVM_FindClassFromClassLoader)(Thread* t, const char* name,
 }
 
 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);
 }
@@ -5344,7 +5344,7 @@ EXPORT(JVM_CX8Field)(JNIEnv*, jobject*, jfieldID*, jlong, jlong)
 { abort(); }
 
 extern "C" JNIEXPORT void JNICALL
-JVM_SetNativeThreadName(JNIEnv*, jobject, jstring) { abort(); }
+EXPORT(JVM_SetNativeThreadName)(JNIEnv*, jobject, jstring) { abort(); }
 
 } // namespace local