src/cpu/x86/vm/jni_x86.h

changeset 4465
203f64878aab
parent 3202
436b4a3231bf
child 5063
58bb870a0cbd
     1.1 --- a/src/cpu/x86/vm/jni_x86.h	Wed Jan 16 16:30:04 2013 +0100
     1.2 +++ b/src/cpu/x86/vm/jni_x86.h	Thu Jan 17 10:25:16 2013 -0500
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -38,14 +38,9 @@
    1.11  
    1.12    #define JNICALL
    1.13    typedef int jint;
    1.14 -#if defined(_LP64) && !defined(__APPLE__)
    1.15 +#if defined(_LP64)
    1.16    typedef long jlong;
    1.17  #else
    1.18 -  /*
    1.19 -   * On _LP64 __APPLE__ "long" and "long long" are both 64 bits,
    1.20 -   * but we use the "long long" typedef to avoid complaints from
    1.21 -   * the __APPLE__ compiler about fprintf formats.
    1.22 -   */
    1.23    typedef long long jlong;
    1.24  #endif
    1.25  

mercurial