Mercurial > hg > truffle
comparison src/share/vm/prims/nativeLookup.cpp @ 8506:c3657d00e343
-Merge with tip
author | Christos Kotselidis <christos.kotselidis@oracle.com> |
---|---|
date | Thu, 21 Mar 2013 14:11:13 +0100 |
parents | 5fc51c1ecdeb |
children | 836a62f43af9 |
comparison
equal
deleted
inserted
replaced
8505:dee7c8b578c7 | 8506:c3657d00e343 |
---|---|
38 #include "runtime/arguments.hpp" | 38 #include "runtime/arguments.hpp" |
39 #include "runtime/handles.inline.hpp" | 39 #include "runtime/handles.inline.hpp" |
40 #include "runtime/javaCalls.hpp" | 40 #include "runtime/javaCalls.hpp" |
41 #include "runtime/sharedRuntime.hpp" | 41 #include "runtime/sharedRuntime.hpp" |
42 #include "runtime/signature.hpp" | 42 #include "runtime/signature.hpp" |
43 #include "utilities/macros.hpp" | |
43 #ifdef TARGET_OS_FAMILY_linux | 44 #ifdef TARGET_OS_FAMILY_linux |
44 # include "os_linux.inline.hpp" | 45 # include "os_linux.inline.hpp" |
45 #endif | 46 #endif |
46 #ifdef TARGET_OS_FAMILY_solaris | 47 #ifdef TARGET_OS_FAMILY_solaris |
47 # include "os_solaris.inline.hpp" | 48 # include "os_solaris.inline.hpp" |