Mercurial > hg > truffle
comparison src/share/vm/prims/nativeLookup.cpp @ 8003:3c9bc17b9403
Merge
author | bpittore |
---|---|
date | Thu, 07 Feb 2013 16:05:48 -0500 |
parents | db9981fd3124 |
children | 5fc51c1ecdeb f0bc60565ba8 |
comparison
equal
deleted
inserted
replaced
7989:454d7cc622ab | 8003:3c9bc17b9403 |
---|---|
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" |