8339540: Unify include requirements for PlatformMonitor/Mutex constru…

…ctors/destructors

Reviewed-by: coleenp, sjohanss

src/hotspot/os/windows/os_windows.cpp

@@ -5741,11 +5741,23 @@ void Parker::unpark() {
   SetEvent(_ParkHandle);
 }
 
+// Platform Mutex/Monitor implementation
+
+PlatformMutex::PlatformMutex() {
+  InitializeCriticalSection(&_mutex);
+}
+
 PlatformMutex::~PlatformMutex() {
   DeleteCriticalSection(&_mutex);
 }
 
-// Platform Monitor implementation
+PlatformMonitor::PlatformMonitor() {
+  InitializeConditionVariable(&_cond);
+}
+
+PlatformMonitor::~PlatformMonitor() {
+  // There is no DeleteConditionVariable API
+}
 
 // Must already be locked
 int PlatformMonitor::wait(uint64_t millis) {

src/hotspot/os/windows/os_windows.inline.hpp

@@ -61,18 +61,6 @@ inline bool os::numa_has_group_homing()     { return false;  }
 
 // Platform Mutex/Monitor implementation
 
-inline PlatformMutex::PlatformMutex() {
-  InitializeCriticalSection(&_mutex);
-}
-
-inline PlatformMonitor::PlatformMonitor() {
-  InitializeConditionVariable(&_cond);
-}
-
-inline PlatformMonitor::~PlatformMonitor() {
-  // There is no DeleteConditionVariable API
-}
-
 inline void PlatformMutex::lock() {
   EnterCriticalSection(&_mutex);
 }