Mercurial > hg > truffle

comparison src/cpu/x86/vm/jni_x86.h @ 7643:3ac7d10a6572

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hsx25/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Thu, 31 Jan 2013 15:42:25 +0100
parents 203f64878aab
children 58bb870a0cbd
comparison
equal deleted inserted replaced
7573:17b6a63fe7c2 7643:3ac7d10a6572
1 /* 1 /*
2 * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. Oracle designates this 7 * published by the Free Software Foundation. Oracle designates this
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 #if defined(_LP64) && !defined(__APPLE__) 41 #if defined(_LP64)
42 typedef long jlong; 42 typedef long jlong;
43 #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 */
49 typedef long long jlong; 44 typedef long long jlong;
50 #endif 45 #endif
51 46
52 #else 47 #else
53 #define JNIEXPORT __declspec(dllexport) 48 #define JNIEXPORT __declspec(dllexport)