From d17aa0b326b311e973eabdaf76c47cbcc0cfc614 Mon Sep 17 00:00:00 2001
From: ctornqvi <unknown>
Date: Thu, 10 Feb 2011 12:55:56 +0100
Subject: [PATCH] 7018366: hotspot/runtime_erro Fix for 7014918 does not build
 using MVC 2003 Summary: Looking at API_VERSION_NUMBER define to see what
 version of dbghelp.h/imagehlp.h is included to determine what MINIDUMP_TYPEs
 are defined in the header file Reviewed-by: acorn, brutisso, sla

---
 src/os/windows/vm/os_windows.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/os/windows/vm/os_windows.cpp b/src/os/windows/vm/os_windows.cpp
index 50018200d..1b1f04bd0 100644
--- a/src/os/windows/vm/os_windows.cpp
+++ b/src/os/windows/vm/os_windows.cpp
@@ -956,9 +956,14 @@ void os::check_or_create_dump(void* exceptionRecord, void* contextRecord, char*
     return;
   }
 
-  dumpType = (MINIDUMP_TYPE)(MiniDumpWithFullMemory | MiniDumpWithFullMemoryInfo |
-    MiniDumpWithHandleData | MiniDumpWithThreadInfo | MiniDumpWithUnloadedModules);
+  dumpType = (MINIDUMP_TYPE)(MiniDumpWithFullMemory | MiniDumpWithHandleData);
 
+// Older versions of dbghelp.h doesn't contain all the dumptypes we want, dbghelp.h with
+// API_VERSION_NUMBER 11 or higher contains the ones we want though
+#if API_VERSION_NUMBER >= 11
+  dumpType = (MINIDUMP_TYPE)(dumpType | MiniDumpWithFullMemoryInfo | MiniDumpWithThreadInfo |
+    MiniDumpWithUnloadedModules);
+#endif
 
   cwd = get_current_directory(NULL, 0);
   jio_snprintf(buffer, bufferSize, "%s\\hs_err_pid%u.mdmp",cwd, current_process_id());
-- 
GitLab