comparison src/share/vm/prims/jvm.h @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 3482684330ee a103c376459a
children eaf39a954227
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
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