Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp @ 18058:54bc75c144b0
Merge
author | asaha |
---|---|
date | Thu, 29 May 2014 13:14:25 -0700 |
parents | bdd155477289 |
children | 4ca6dc0799b6 ab5fbf410512 |
comparison
equal
deleted
inserted
replaced
18055:1fa005fb28f5 | 18058:54bc75c144b0 |
---|---|
35 #ifdef TARGET_OS_FAMILY_solaris | 35 #ifdef TARGET_OS_FAMILY_solaris |
36 # include "os_solaris.inline.hpp" | 36 # include "os_solaris.inline.hpp" |
37 #endif | 37 #endif |
38 #ifdef TARGET_OS_FAMILY_windows | 38 #ifdef TARGET_OS_FAMILY_windows |
39 # include "os_windows.inline.hpp" | 39 # include "os_windows.inline.hpp" |
40 #endif | |
41 #ifdef TARGET_OS_FAMILY_aix | |
42 # include "os_aix.inline.hpp" | |
40 #endif | 43 #endif |
41 #ifdef TARGET_OS_FAMILY_bsd | 44 #ifdef TARGET_OS_FAMILY_bsd |
42 # include "os_bsd.inline.hpp" | 45 # include "os_bsd.inline.hpp" |
43 #endif | 46 #endif |
44 | 47 |