Bug 626169 - [Win2k3 SDK] "nsExceptionHandler.cpp(739) : error C2065: 'MiniDumpWithFullMemoryInfo' : undeclared identifier"; (Av1) Match existing |ifdef XP_WIN32|, Add |#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN|.
authorSerge Gautherie <sgautherie.bz@free.fr>
Wed, 02 Feb 2011 18:32:19 +0100
changeset 61785 04a3cfea8e20be68b31ca430661e07bf1d0ac66c
parent 61784 6cb543f7d5b0613aacffbb115ba392851ca5259c
child 61789 800b80b291939f9d08f0b89cf076d49e6ed4f0be
push id18489
push usersgautherie.bz@free.fr
push dateWed, 02 Feb 2011 17:33:10 +0000
treeherdermozilla-central@04a3cfea8e20 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs626169
milestone2.0b11pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 626169 - [Win2k3 SDK] "nsExceptionHandler.cpp(739) : error C2065: 'MiniDumpWithFullMemoryInfo' : undeclared identifier"; (Av1) Match existing |ifdef XP_WIN32|, Add |#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN|. r=ted.mielczarek a-2.0=benjamin.
toolkit/crashreporter/nsExceptionHandler.cpp
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -712,20 +712,23 @@ nsresult SetExceptionHandler(nsILocalFil
                                     pref_cpu_types,
                                     &attr_ocount) != 0 ||
       attr_ocount != attr_count) {
     posix_spawnattr_destroy(&spawnattr);
     return NS_ERROR_FAILURE;
   }
 #endif
 
-#ifdef XP_WIN
+#ifdef XP_WIN32
+  MINIDUMP_TYPE minidump_type = MiniDumpNormal;
+
+#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
   // Try to determine what version of dbghelp.dll we're using.
   // MinidumpWithFullMemoryInfo is only available in 6.1.x or newer.
-  MINIDUMP_TYPE minidump_type = MiniDumpNormal;
+
   DWORD version_size = GetFileVersionInfoSizeW(L"dbghelp.dll", NULL);
   if (version_size > 0) {
     std::vector<BYTE> buffer(version_size);
     if (GetFileVersionInfoW(L"dbghelp.dll",
                             0,
                             version_size,
                             &buffer[0])) {
       UINT len;
@@ -735,17 +738,18 @@ nsresult SetExceptionHandler(nsILocalFil
            minor = LOWORD(file_info->dwFileVersionMS),
            revision = HIWORD(file_info->dwFileVersionLS);
       if (major > 6 || (major == 6 && minor > 1) ||
           (major == 6 && minor == 1 && revision >= 7600)) {
         minidump_type = MiniDumpWithFullMemoryInfo;
       }
     }
   }
-#endif
+#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
+#endif // XP_WIN32
 
   // now set the exception handler
   gExceptionHandler = new google_breakpad::
     ExceptionHandler(tempPath.get(),
 #ifdef XP_WIN
                      FPEFilter,
 #else
                      nsnull,