comparison src/share/vm/prims/jvm.h @ 14521:29ccc4cbabca

Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 12 Mar 2014 13:30:08 +0100
parents d8041d695d19
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14520:f84115370178 14521:29ccc4cbabca
32 #ifdef TARGET_OS_FAMILY_solaris 32 #ifdef TARGET_OS_FAMILY_solaris
33 # include "jvm_solaris.h" 33 # include "jvm_solaris.h"
34 #endif 34 #endif
35 #ifdef TARGET_OS_FAMILY_windows 35 #ifdef TARGET_OS_FAMILY_windows
36 # include "jvm_windows.h" 36 # include "jvm_windows.h"
37 #endif
38 #ifdef TARGET_OS_FAMILY_aix
39 # include "jvm_aix.h"
37 #endif 40 #endif
38 #ifdef TARGET_OS_FAMILY_bsd 41 #ifdef TARGET_OS_FAMILY_bsd
39 # include "jvm_bsd.h" 42 # include "jvm_bsd.h"
40 #endif 43 #endif
41 44