X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogbacktrace_win.cpp;fp=src%2Fcommon%2Flogbacktrace_win.cpp;h=5c9a420cd5d542dce2459c3dadc31633d0a1f193;hp=779e5cbe4a64ec32172b302e620a3086d6a38691;hb=c806d8e92f2ccbc2886ffe6257f7597e28c355dd;hpb=8b971bc9269a815d91358c05d32f8a116780a46a diff --git a/src/common/logbacktrace_win.cpp b/src/common/logbacktrace_win.cpp index 779e5cbe..5c9a420c 100644 --- a/src/common/logbacktrace_win.cpp +++ b/src/common/logbacktrace_win.cpp @@ -49,11 +49,7 @@ struct EnumModulesContext { EnumModulesContext(HANDLE hProcess, QTextStream &stream) : hProcess(hProcess), stream(stream) {} }; -#if _MSC_VER >= 1500 BOOL CALLBACK EnumModulesCB(PCTSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext) { -#else -BOOL CALLBACK EnumModulesCB(PSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext) { -#endif IMAGEHLP_MODULE64 mod; EnumModulesContext *context = (EnumModulesContext *)UserContext; mod.SizeOfStruct = sizeof(IMAGEHLP_MODULE64); @@ -74,6 +70,11 @@ BOOL CALLBACK EnumModulesCB(PSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContex return TRUE; } +// we don't use the ModuleName anyways so we can easily "convert" this +inline BOOL CALLBACK EnumModulesCB(PSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext) { + return EnumModulesCB(PCTSTR(0), BaseOfDll, UserContext); +} + #ifdef _M_IX86 // Disable global optimization and ignore /GS waning caused by // inline assembly.