From 21fd23e1f5c21960ca76903abcb50bb9f3561276 Mon Sep 17 00:00:00 2001 From: "dbaron@dbaron.org" Date: Mon, 27 Aug 2007 22:42:25 -0700 Subject: [PATCH] Back out a small part of bug 391848 to fix bustage for some people (and add a comment warning about the problem). --- xpcom/base/nsStackWalk.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xpcom/base/nsStackWalk.cpp b/xpcom/base/nsStackWalk.cpp index 7bced5cb3c0..5e10f4b4770 100644 --- a/xpcom/base/nsStackWalk.cpp +++ b/xpcom/base/nsStackWalk.cpp @@ -810,7 +810,9 @@ BOOL SymGetModuleInfoEspecial(HANDLE aProcess, DWORD aAddr, PIMAGEHLP_MODULE aMo * Not loaded, here's the magic. * Go through all the modules. */ - enumRes = _EnumerateLoadedModules(aProcess, callbackEspecial, (PVOID)&aAddr); + // Need to cast to PENUMLOADED_MODULES_CALLBACK for some compiler + // or platform SDK; see bug 391848. + enumRes = _EnumerateLoadedModules(aProcess, (PENUMLOADED_MODULES_CALLBACK)callbackEspecial, (PVOID)&aAddr); if (FALSE != enumRes) { /* @@ -877,7 +879,9 @@ BOOL SymGetModuleInfoEspecial64(HANDLE aProcess, DWORD64 aAddr, PIMAGEHLP_MODULE * Not loaded, here's the magic. * Go through all the modules. */ - enumRes = _EnumerateLoadedModules64(aProcess, callbackEspecial64, (PVOID)&aAddr); + // Need to cast to PENUMLOADED_MODULES_CALLBACK for some compiler + // or platform SDK; see bug 391848. + enumRes = _EnumerateLoadedModules64(aProcess, (PENUMLOADED_MODULES_CALLBACK64)callbackEspecial64, (PVOID)&aAddr); if (FALSE != enumRes) { /*