Mercurial > hg > graal-compiler
comparison 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 |
comparison
equal
deleted
inserted
replaced
14360:e8ef156f0bc9 | 14460:8a9bb7821e28 |
---|---|
74 # include "jvm_solaris.h" | 74 # include "jvm_solaris.h" |
75 #endif | 75 #endif |
76 #ifdef TARGET_OS_FAMILY_windows | 76 #ifdef TARGET_OS_FAMILY_windows |
77 # include "jvm_windows.h" | 77 # include "jvm_windows.h" |
78 #endif | 78 #endif |
79 #ifdef TARGET_OS_FAMILY_aix | |
80 # include "jvm_aix.h" | |
81 #endif | |
79 #ifdef TARGET_OS_FAMILY_bsd | 82 #ifdef TARGET_OS_FAMILY_bsd |
80 # include "jvm_bsd.h" | 83 # include "jvm_bsd.h" |
81 #endif | 84 #endif |
82 | 85 |
83 #include <errno.h> | 86 #include <errno.h> |