src/java.security.jgss/share/native/libj2gss/NativeUtil.c

*** 1,7 ****
  /*
!  * Copyright (c) 2005, 2014, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 25,34 ****
--- 25,35 ----
  
  #include "NativeUtil.h"
  #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 */
  const int JAVA_UNSEQ_TOKEN_CODE = 21; /* UNSEQ_TOKEN */
  const int JAVA_GAP_TOKEN_CODE = 22; /* GAP_TOKEN */
*** 92,102 ****
  jfieldID FID_NativeGSSContext_actualMech;
  
  int JGSS_DEBUG;
  
  JNIEXPORT jint JNICALL
! JNI_OnLoad(JavaVM *jvm, void *reserved) {
    JNIEnv *env;
    jclass cls;
  
    if ((*jvm)->GetEnv(jvm, (void **)&env, JNI_VERSION_1_2)) {
      return JNI_EVERSION; /* JNI version not supported */
--- 93,103 ----
  jfieldID FID_NativeGSSContext_actualMech;
  
  int JGSS_DEBUG;
  
  JNIEXPORT jint JNICALL
! DEF_JNI_OnLoad(JavaVM *jvm, void *reserved) {
    JNIEnv *env;
    jclass cls;
  
    if ((*jvm)->GetEnv(jvm, (void **)&env, JNI_VERSION_1_2)) {
      return JNI_EVERSION; /* JNI version not supported */
*** 361,371 ****
    }
    return JNI_VERSION_1_2;
  }
  
  JNIEXPORT void JNICALL
! JNI_OnUnload(JavaVM *jvm, void *reserved) {
    JNIEnv *env;
  
    if ((*jvm)->GetEnv(jvm, (void **)&env, JNI_VERSION_1_2)) {
      return;
    }
--- 362,372 ----
    }
    return JNI_VERSION_1_2;
  }
  
  JNIEXPORT void JNICALL
! DEF_JNI_OnUnload(JavaVM *jvm, void *reserved) {
    JNIEnv *env;
  
    if ((*jvm)->GetEnv(jvm, (void **)&env, JNI_VERSION_1_2)) {
      return;
    }