Mercurial > hg > truffle
diff src/share/vm/prims/jvm.cpp @ 14465:28f281e8de1d
Merge
author | kvn |
---|---|
date | Thu, 20 Feb 2014 12:20:56 -0800 |
parents | e6195383bcaf 8a9bb7821e28 |
children | 016b6a289fc4 |
line wrap: on
line diff
--- a/src/share/vm/prims/jvm.cpp Tue Feb 18 09:54:24 2014 -0500 +++ b/src/share/vm/prims/jvm.cpp Thu Feb 20 12:20:56 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