src/java.smartcardio/share/native/libj2pcsc/pcsc.c

rev 12879 : 8136556: Add the ability to perform static builds of MacOSX x64 binaries
Reviewed-by: ihse, bdelsart, gadams, lfoltan, rriggs, hseigel, twisti

*** 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
*** 53,62 ****
--- 53,64 ----
  
  #include "sun_security_smartcardio_PCSC.h"
  
  #include "pcsc_md.h"
  
+ #include "jni_util.h"
+ 
  #define MAX_STACK_BUFFER_SIZE 8192
  
  // make the buffers larger than what should be necessary, just in case
  #define ATR_BUFFER_SIZE 128
  #define READERNAME_BUFFER_SIZE 128
*** 99,109 ****
          throwPCSCException(env, code);
          return JNI_TRUE;
      }
  }
  
! JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
      return JNI_VERSION_1_4;
  }
  
  JNIEXPORT jlong JNICALL Java_sun_security_smartcardio_PCSC_SCardEstablishContext
      (JNIEnv *env, jclass thisClass, jint dwScope)
--- 101,111 ----
          throwPCSCException(env, code);
          return JNI_TRUE;
      }
  }
  
! JNIEXPORT jint JNICALL DEF_JNI_OnLoad(JavaVM *vm, void *reserved) {
      return JNI_VERSION_1_4;
  }
  
  JNIEXPORT jlong JNICALL Java_sun_security_smartcardio_PCSC_SCardEstablishContext
      (JNIEnv *env, jclass thisClass, jint dwScope)