Mercurial > hg > truffle
comparison src/share/vm/prims/jvm.cpp @ 14456:abec000618bf
Merge
author | kvn |
---|---|
date | Tue, 28 Jan 2014 12:25:34 -0800 |
parents | 0f2de9d724a9 2b8e28fdf503 |
children | 8a9bb7821e28 |
comparison
equal
deleted
inserted
replaced
14269:2a8891e0a082 | 14456:abec000618bf |
---|---|
74 # include "jvm_solaris.h" | 74 # include "jvm_solaris.h" |
75 #endif | 75 #endif |
76 #ifdef TARGET_OS_FAMILY_windows | 76 #ifdef TARGET_OS_FAMILY_windows |
77 # include "jvm_windows.h" | 77 # include "jvm_windows.h" |
78 #endif | 78 #endif |
79 #ifdef TARGET_OS_FAMILY_aix | |
80 # include "jvm_aix.h" | |
81 #endif | |
79 #ifdef TARGET_OS_FAMILY_bsd | 82 #ifdef TARGET_OS_FAMILY_bsd |
80 # include "jvm_bsd.h" | 83 # include "jvm_bsd.h" |
81 #endif | 84 #endif |
82 | 85 |
83 #include <errno.h> | 86 #include <errno.h> |