1.1 --- a/src/share/vm/gc_implementation/g1/ptrQueue.cpp Tue Nov 27 10:13:20 2012 +0100 1.2 +++ b/src/share/vm/gc_implementation/g1/ptrQueue.cpp Tue Nov 27 14:20:21 2012 +0100 1.3 @@ -28,18 +28,7 @@ 1.4 #include "memory/allocation.inline.hpp" 1.5 #include "runtime/mutex.hpp" 1.6 #include "runtime/mutexLocker.hpp" 1.7 -#ifdef TARGET_OS_FAMILY_linux 1.8 -# include "thread_linux.inline.hpp" 1.9 -#endif 1.10 -#ifdef TARGET_OS_FAMILY_solaris 1.11 -# include "thread_solaris.inline.hpp" 1.12 -#endif 1.13 -#ifdef TARGET_OS_FAMILY_windows 1.14 -# include "thread_windows.inline.hpp" 1.15 -#endif 1.16 -#ifdef TARGET_OS_FAMILY_bsd 1.17 -# include "thread_bsd.inline.hpp" 1.18 -#endif 1.19 +#include "runtime/thread.inline.hpp" 1.20 1.21 PtrQueue::PtrQueue(PtrQueueSet* qset, bool perm, bool active) : 1.22 _qset(qset), _buf(NULL), _index(0), _active(active),