src/java.base/unix/native/libjava/jlong_md.h

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) 1997, 2008, 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) 1997, 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
*** 63,77 ****
  
  /* For static variables initialized to zero */
  #define jlong_zero_init  ((jlong) 0L)
  
  #ifdef _LP64
! #define jlong_to_ptr(a) ((void*)(a))
! #define ptr_to_jlong(a) ((jlong)(a))
  #else
! #define jlong_to_ptr(a) ((void*)(int)(a))
! #define ptr_to_jlong(a) ((jlong)(int)(a))
  #endif
  
  #define jint_to_jlong(a)        ((jlong)(a))
  #define jlong_to_jint(a)        ((jint)(a))
  
--- 63,85 ----
  
  /* For static variables initialized to zero */
  #define jlong_zero_init  ((jlong) 0L)
  
  #ifdef _LP64
!   #ifndef jlong_to_ptr
!     #define jlong_to_ptr(a) ((void*)(a))
!   #endif
!   #ifndef ptr_to_jlong
!     #define ptr_to_jlong(a) ((jlong)(a))
!   #endif
  #else
!   #ifndef jlong_to_ptr
!     #define jlong_to_ptr(a) ((void*)(int)(a))
!   #endif
!   #ifndef ptr_to_jlong
!     #define ptr_to_jlong(a) ((jlong)(int)(a))
!   #endif
  #endif
  
  #define jint_to_jlong(a)        ((jlong)(a))
  #define jlong_to_jint(a)        ((jint)(a))