comparison src/share/vm/memory/space.hpp @ 14456:abec000618bf

Merge
author kvn
date Tue, 28 Jan 2014 12:25:34 -0800
parents de6a9e811145 bdd155477289
children 8a9bb7821e28 c49dcaf78a65
comparison
equal deleted inserted replaced
14269:2a8891e0a082 14456:abec000618bf
43 # include "os_solaris.inline.hpp" 43 # include "os_solaris.inline.hpp"
44 #endif 44 #endif
45 #ifdef TARGET_OS_FAMILY_windows 45 #ifdef TARGET_OS_FAMILY_windows
46 # include "os_windows.inline.hpp" 46 # include "os_windows.inline.hpp"
47 #endif 47 #endif
48 #ifdef TARGET_OS_FAMILY_aix
49 # include "os_aix.inline.hpp"
50 #endif
48 #ifdef TARGET_OS_FAMILY_bsd 51 #ifdef TARGET_OS_FAMILY_bsd
49 # include "os_bsd.inline.hpp" 52 # include "os_bsd.inline.hpp"
50 #endif 53 #endif
51 54
52 // A space is an abstraction for the "storage units" backing 55 // A space is an abstraction for the "storage units" backing