comparison src/share/vm/prims/jvm.h @ 17812:a7d4d4655766

Merge
author kvn
date Wed, 26 Mar 2014 18:21:05 -0700
parents 2b8e28fdf503
children d8041d695d19 a103c376459a 54bc75c144b0
comparison
equal deleted inserted replaced
17789:6b207d038106 17812:a7d4d4655766
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