Mercurial > hg > truffle
diff src/share/vm/utilities/elfStringTable.hpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | 4ca6dc0799b6 |
children |
line wrap: on
line diff
--- a/src/share/vm/utilities/elfStringTable.hpp Thu Oct 16 10:21:29 2014 +0200 +++ b/src/share/vm/utilities/elfStringTable.hpp Wed Oct 15 16:02:50 2014 +0200 @@ -70,6 +70,6 @@ NullDecoder::decoder_status m_status; }; -#endif // _WINDOWS and _APPLE +#endif // !_WINDOWS && !__APPLE__ #endif // SHARE_VM_UTILITIES_ELF_STRING_TABLE_HPP