diff src/share/vm/memory/space.hpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c
children 7848fc12602b
line wrap: on
line diff
--- a/src/share/vm/memory/space.hpp	Thu Oct 16 10:21:29 2014 +0200
+++ b/src/share/vm/memory/space.hpp	Wed Oct 15 16:02:50 2014 +0200
@@ -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