--- old/src/java.base/macosx/native/libjli/java_md_macosx.m	2018-10-17 13:36:10.000000000 -0700
+++ new/src/java.base/macosx/native/libjli/java_md_macosx.m	2018-10-17 13:36:10.000000000 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -761,7 +761,7 @@
  * Note there is a callback on this function from the splashscreen logic,
  * this as well SetJavaVMValue() needs to be simplified.
  */
-JavaVM*
+JNIEXPORT JavaVM* JNICALL
 JLI_GetJavaVMInstance()
 {
     return jvmInstance;
--- old/test/jdk/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	2018-10-17 13:36:12.000000000 -0700
+++ new/test/jdk/java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java	2018-10-17 13:36:12.000000000 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
 /**
  * @test
  * @key headful
- * @bug 8043869 8075244 8078082 8145173 8151787
+ * @bug 8043869 8075244 8078082 8145173 8151787 8212213
  * @summary Tests the HiDPI splash screen support for windows and MAC
  * @modules java.desktop/sun.java2d
  * @run main MultiResolutionSplashTest GENERATE_IMAGES