--- a/jdk/src/java.base/share/native/libjimage/ImageNativeSubstrate.cpp	Thu Oct 15 14:41:37 2015 +0100
+++ b/jdk/src/java.base/share/native/libjimage/ImageNativeSubstrate.cpp	Mon Oct 19 13:41:09 2015 -0400
@@ -236,7 +236,7 @@
 }
 
 JNIEXPORT jint JNICALL
-JNI_OnLoad(JavaVM *vm, void *reserved) {
+DEF_JNI_OnLoad(JavaVM *vm, void *reserved) {
     JNIEnv *env;
 
     if (vm->GetEnv((void**) &env, JNI_VERSION_1_2) != JNI_OK) {
@@ -594,6 +594,6 @@
     return module;
 }
 
-JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved) {
+JNIEXPORT void JNICALL DEF_JNI_OnUnload(JavaVM *vm, void *reserved) {
     ImageDecompressor::image_decompressor_close();
 }