comparison src/share/vm/runtime/task.cpp @ 4137:04b9a2566eec

Merge with hsx23/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 21:40:27 +0100
parents f08d439fab8c
children c284cf4781f0
comparison
equal deleted inserted replaced
3737:9dc19b7d89a3 4137:04b9a2566eec
36 # include "thread_solaris.inline.hpp" 36 # include "thread_solaris.inline.hpp"
37 #endif 37 #endif
38 #ifdef TARGET_OS_FAMILY_windows 38 #ifdef TARGET_OS_FAMILY_windows
39 # include "os_windows.inline.hpp" 39 # include "os_windows.inline.hpp"
40 # include "thread_windows.inline.hpp" 40 # include "thread_windows.inline.hpp"
41 #endif
42 #ifdef TARGET_OS_FAMILY_bsd
43 # include "os_bsd.inline.hpp"
44 # include "thread_bsd.inline.hpp"
41 #endif 45 #endif
42 46
43 int PeriodicTask::_num_tasks = 0; 47 int PeriodicTask::_num_tasks = 0;
44 PeriodicTask* PeriodicTask::_tasks[PeriodicTask::max_tasks]; 48 PeriodicTask* PeriodicTask::_tasks[PeriodicTask::max_tasks];
45 #ifndef PRODUCT 49 #ifndef PRODUCT