Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/utilities/elfStringTable.hpp Sat Dec 17 20:50:09 2011 +0100 +++ b/src/share/vm/utilities/elfStringTable.hpp Sat Dec 17 21:40:27 2011 +0100 @@ -25,7 +25,7 @@ #ifndef __ELF_STRING_TABLE_HPP #define __ELF_STRING_TABLE_HPP -#ifndef _WINDOWS +#if !defined(_WINDOWS) && !defined(__APPLE__) #include "memory/allocation.hpp" #include "utilities/decoder.hpp" @@ -79,4 +79,3 @@ #endif // _WINDOWS #endif // __ELF_STRING_TABLE_HPP -