last tweaks and fixes

Author: gerard-ziemski

src/hotspot/os/windows/globals_windows.hpp

@@ -36,7 +36,7 @@
                          range,                                           \
                          constraint)                                      \
                                                                           \
-product(bool, UseOSErrorReporting, false                                  \
+product(bool, UseOSErrorReporting, false,                                 \
         "Let VM fatal error propagate to the OS (ie. WER on Windows)")
 
 // end of RUNTIME_OS_FLAGS

src/hotspot/os/windows/os_windows.cpp

@@ -2354,7 +2354,7 @@ static inline void report_error(Thread* t, DWORD exception_code,
                                 address addr, void* siginfo, void* context) {
   VMError::report_and_die(t, exception_code, addr, siginfo, context);
 
-  // If UseOsErrorReporting, this will return here and save the error file
+  // If UseOSErrorReporting, this will return here and save the error file
   // somewhere where we can find it in the minidump.
 }
 

src/hotspot/share/utilities/vmError.cpp

@@ -1434,7 +1434,7 @@ void VMError::report_and_die(int id, const char* message, const char* detail_fmt
     reset_signal_handlers();
   } else {
 #if defined(_WINDOWS)
-    // If UseOsErrorReporting we call this for each level of the call stack
+    // If UseOSErrorReporting we call this for each level of the call stack
     // while searching for the exception handler.  Only the first level needs
     // to be reported.
     if (UseOSErrorReporting && log_done) return;
@@ -1628,11 +1628,7 @@ void VMError::report_and_die(int id, const char* message, const char* detail_fmt
     OnError = NULL;
   }
 
-#if defined(_WINDOWS)
-  if (!UseOSErrorReporting) {
-#else
-  if (true) {
-#endif
+  if (WINDOWS_ONLY(!UseOsErrorReporting) NOT_WINDOWS(true)) {
     // os::abort() will call abort hooks, try it first.
     static bool skip_os_abort = false;
     if (!skip_os_abort) {