Mercurial > hg > truffle
comparison src/share/vm/c1/c1_globals.hpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | a9becfeecd1b |
children | d8041d695d19 b9c94af14fd0 |
comparison
equal
deleted
inserted
replaced
17789:6b207d038106 | 17812:a7d4d4655766 |
---|---|
45 # include "c1_globals_solaris.hpp" | 45 # include "c1_globals_solaris.hpp" |
46 #endif | 46 #endif |
47 #ifdef TARGET_OS_FAMILY_windows | 47 #ifdef TARGET_OS_FAMILY_windows |
48 # include "c1_globals_windows.hpp" | 48 # include "c1_globals_windows.hpp" |
49 #endif | 49 #endif |
50 #ifdef TARGET_OS_FAMILY_aix | |
51 # include "c1_globals_aix.hpp" | |
52 #endif | |
50 #ifdef TARGET_OS_FAMILY_bsd | 53 #ifdef TARGET_OS_FAMILY_bsd |
51 # include "c1_globals_bsd.hpp" | 54 # include "c1_globals_bsd.hpp" |
52 #endif | 55 #endif |
53 | 56 |
54 // | 57 // |