Mercurial > hg > truffle
diff src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp @ 18058:54bc75c144b0
Merge
author | asaha |
---|---|
date | Thu, 29 May 2014 13:14:25 -0700 |
parents | bdd155477289 |
children | 4ca6dc0799b6 ab5fbf410512 |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp Wed May 28 08:09:26 2014 -0400 +++ b/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp Thu May 29 13:14:25 2014 -0700 @@ -38,6 +38,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" #endif +#ifdef TARGET_OS_FAMILY_aix +# include "os_aix.inline.hpp" +#endif #ifdef TARGET_OS_FAMILY_bsd # include "os_bsd.inline.hpp" #endif