Mercurial > hg > graal-compiler
diff src/share/vm/utilities/elfStringTable.hpp @ 3960:f08d439fab8c
7089790: integrate bsd-port changes
Reviewed-by: kvn, twisti, jrose
Contributed-by: Kurt Miller <kurt@intricatesoftware.com>, Greg Lewis <glewis@eyesbeyond.com>, Jung-uk Kim <jkim@freebsd.org>, Christos Zoulas <christos@zoulas.com>, Landon Fuller <landonf@plausible.coop>, The FreeBSD Foundation <board@freebsdfoundation.org>, Michael Franz <mvfranz@gmail.com>, Roger Hoover <rhoover@apple.com>, Alexander Strange <astrange@apple.com>
| author | never |
|---|---|
| date | Sun, 25 Sep 2011 16:03:29 -0700 |
| parents | 2d4762ec74af |
| children | d7e3846464d0 |
line wrap: on
line diff
--- a/src/share/vm/utilities/elfStringTable.hpp Tue Sep 20 23:50:16 2011 -0700 +++ b/src/share/vm/utilities/elfStringTable.hpp Sun Sep 25 16:03:29 2011 -0700 @@ -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 -