Mercurial > hg > graal-compiler
diff src/share/vm/memory/allocation.cpp @ 14456:abec000618bf
Merge
author | kvn |
---|---|
date | Tue, 28 Jan 2014 12:25:34 -0800 |
parents | db1ff6781ab4 2b8e28fdf503 |
children | 4ca6dc0799b6 |
line wrap: on
line diff
--- a/src/share/vm/memory/allocation.cpp Tue Jan 28 11:21:43 2014 -0800 +++ b/src/share/vm/memory/allocation.cpp Tue Jan 28 12:25:34 2014 -0800 @@ -45,6 +45,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