comparison src/share/vm/prims/jvm.h @ 14518:d8041d695d19

Merged with jdk9/dev/hotspot changeset 3812c088b945
author twisti
date Tue, 11 Mar 2014 18:45:59 -0700
parents 096c224171c4 2b8e28fdf503
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14141:f97c5ec83832 14518:d8041d695d19
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