--- a/jdk/src/java.security.jgss/share/native/libj2gss/NativeUtil.c	Thu Oct 15 14:41:37 2015 +0100
+++ b/jdk/src/java.security.jgss/share/native/libj2gss/NativeUtil.c	Mon Oct 19 13:41:09 2015 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, 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
@@ -27,6 +27,7 @@
 #include "NativeFunc.h"
 #include "jlong.h"
 #include <jni.h>
+#include "jni_util.h"
 
 const int JAVA_DUPLICATE_TOKEN_CODE = 19; /* DUPLICATE_TOKEN */
 const int JAVA_OLD_TOKEN_CODE = 20; /* OLD_TOKEN */
@@ -94,7 +95,7 @@
 int JGSS_DEBUG;
 
 JNIEXPORT jint JNICALL
-JNI_OnLoad(JavaVM *jvm, void *reserved) {
+DEF_JNI_OnLoad(JavaVM *jvm, void *reserved) {
   JNIEnv *env;
   jclass cls;
 
@@ -363,7 +364,7 @@
 }
 
 JNIEXPORT void JNICALL
-JNI_OnUnload(JavaVM *jvm, void *reserved) {
+DEF_JNI_OnUnload(JavaVM *jvm, void *reserved) {
   JNIEnv *env;
 
   if ((*jvm)->GetEnv(jvm, (void **)&env, JNI_VERSION_1_2)) {