Mercurial > hg > graal-jvmci-8
comparison src/cpu/x86/vm/jni_x86.h @ 4006:436b4a3231bf
7098194: integrate macosx-port changes
Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29.
Reviewed-by: kvn, dholmes, never, phh
Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
author | dcubed |
---|---|
date | Thu, 13 Oct 2011 09:35:42 -0700 |
parents | f08d439fab8c |
children | 203f64878aab |
comparison
equal
deleted
inserted
replaced
4005:2ef3386478e6 | 4006:436b4a3231bf |
---|---|
36 #define JNIIMPORT | 36 #define JNIIMPORT |
37 #endif | 37 #endif |
38 | 38 |
39 #define JNICALL | 39 #define JNICALL |
40 typedef int jint; | 40 typedef int jint; |
41 | 41 #if defined(_LP64) && !defined(__APPLE__) |
42 #ifdef _LP64 | |
43 typedef long jlong; | 42 typedef long jlong; |
44 #else | 43 #else |
44 /* | |
45 * On _LP64 __APPLE__ "long" and "long long" are both 64 bits, | |
46 * but we use the "long long" typedef to avoid complaints from | |
47 * the __APPLE__ compiler about fprintf formats. | |
48 */ | |
45 typedef long long jlong; | 49 typedef long long jlong; |
46 #endif | 50 #endif |
47 | 51 |
48 #else | 52 #else |
49 #define JNIEXPORT __declspec(dllexport) | 53 #define JNIEXPORT __declspec(dllexport) |