diff src/share/vm/runtime/fprofiler.hpp @ 7182:c24f778e9401

Merge
author johnc
date Thu, 29 Nov 2012 11:23:15 -0800
parents f34d701e952e
children db9981fd3124
line wrap: on
line diff
--- a/src/share/vm/runtime/fprofiler.hpp	Wed Nov 28 17:50:21 2012 -0500
+++ b/src/share/vm/runtime/fprofiler.hpp	Thu Nov 29 11:23:15 2012 -0800
@@ -26,18 +26,6 @@
 #define SHARE_VM_RUNTIME_FPROFILER_HPP
 
 #include "runtime/timer.hpp"
-#ifdef TARGET_OS_FAMILY_linux
-# include "thread_linux.inline.hpp"
-#endif
-#ifdef TARGET_OS_FAMILY_solaris
-# include "thread_solaris.inline.hpp"
-#endif
-#ifdef TARGET_OS_FAMILY_windows
-# include "thread_windows.inline.hpp"
-#endif
-#ifdef TARGET_OS_FAMILY_bsd
-# include "thread_bsd.inline.hpp"
-#endif
 
 // a simple flat profiler for Java