1.1 --- a/src/share/vm/memory/universe.cpp Tue Nov 27 10:13:20 2012 +0100 1.2 +++ b/src/share/vm/memory/universe.cpp Tue Nov 27 14:20:21 2012 +0100 1.3 @@ -62,6 +62,7 @@ 1.4 #include "runtime/javaCalls.hpp" 1.5 #include "runtime/sharedRuntime.hpp" 1.6 #include "runtime/synchronizer.hpp" 1.7 +#include "runtime/thread.inline.hpp" 1.8 #include "runtime/timer.hpp" 1.9 #include "runtime/vm_operations.hpp" 1.10 #include "services/memoryService.hpp" 1.11 @@ -69,18 +70,6 @@ 1.12 #include "utilities/events.hpp" 1.13 #include "utilities/hashtable.inline.hpp" 1.14 #include "utilities/preserveException.hpp" 1.15 -#ifdef TARGET_OS_FAMILY_linux 1.16 -# include "thread_linux.inline.hpp" 1.17 -#endif 1.18 -#ifdef TARGET_OS_FAMILY_solaris 1.19 -# include "thread_solaris.inline.hpp" 1.20 -#endif 1.21 -#ifdef TARGET_OS_FAMILY_windows 1.22 -# include "thread_windows.inline.hpp" 1.23 -#endif 1.24 -#ifdef TARGET_OS_FAMILY_bsd 1.25 -# include "thread_bsd.inline.hpp" 1.26 -#endif 1.27 #ifndef SERIALGC 1.28 #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp" 1.29 #include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"