Mercurial > hg > graal-compiler
diff src/share/vm/prims/jvm.h @ 18041:52b4284cb496
Merge with jdk8u20-b26
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Wed, 15 Oct 2014 16:02:50 +0200 |
| parents | 3482684330ee a103c376459a |
| children | eaf39a954227 |
line wrap: on
line diff
--- a/src/share/vm/prims/jvm.h Thu Oct 16 10:21:29 2014 +0200 +++ b/src/share/vm/prims/jvm.h Wed Oct 15 16:02:50 2014 +0200 @@ -35,6 +35,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