comparison src/share/vm/prims/jvm.h @ 18058:54bc75c144b0

Merge
author asaha
date Thu, 29 May 2014 13:14:25 -0700
parents 21444610cb92 2b8e28fdf503
children 1e657b902392
comparison
equal deleted inserted replaced
18055:1fa005fb28f5 18058:54bc75c144b0
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