diff src/share/vm/prims/jvm.cpp @ 14460:8a9bb7821e28

Merge
author kvn
date Wed, 19 Feb 2014 12:08:49 -0800
parents 78fde43dc07d abec000618bf
children 28f281e8de1d
line wrap: on
line diff
--- a/src/share/vm/prims/jvm.cpp	Thu Feb 13 17:57:27 2014 +0100
+++ b/src/share/vm/prims/jvm.cpp	Wed Feb 19 12:08:49 2014 -0800
@@ -76,6 +76,9 @@
 #ifdef TARGET_OS_FAMILY_windows
 # include "jvm_windows.h"
 #endif
+#ifdef TARGET_OS_FAMILY_aix
+# include "jvm_aix.h"
+#endif
 #ifdef TARGET_OS_FAMILY_bsd
 # include "jvm_bsd.h"
 #endif