Mercurial > hg > truffle
comparison src/share/vm/utilities/elfStringTable.hpp @ 4137:04b9a2566eec
Merge with hsx23/hotspot.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sat, 17 Dec 2011 21:40:27 +0100 |
parents | f08d439fab8c |
children | d7e3846464d0 |
comparison
equal
deleted
inserted
replaced
3737:9dc19b7d89a3 | 4137:04b9a2566eec |
---|---|
23 */ | 23 */ |
24 | 24 |
25 #ifndef __ELF_STRING_TABLE_HPP | 25 #ifndef __ELF_STRING_TABLE_HPP |
26 #define __ELF_STRING_TABLE_HPP | 26 #define __ELF_STRING_TABLE_HPP |
27 | 27 |
28 #ifndef _WINDOWS | 28 #if !defined(_WINDOWS) && !defined(__APPLE__) |
29 | 29 |
30 #include "memory/allocation.hpp" | 30 #include "memory/allocation.hpp" |
31 #include "utilities/decoder.hpp" | 31 #include "utilities/decoder.hpp" |
32 #include "utilities/elfFile.hpp" | 32 #include "utilities/elfFile.hpp" |
33 | 33 |
77 }; | 77 }; |
78 | 78 |
79 #endif // _WINDOWS | 79 #endif // _WINDOWS |
80 | 80 |
81 #endif // __ELF_STRING_TABLE_HPP | 81 #endif // __ELF_STRING_TABLE_HPP |
82 |