X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogbacktrace_win.cpp;h=31d1f957acb99f382bdcc72aed1b3b8f0b724589;hp=779e5cbe4a64ec32172b302e620a3086d6a38691;hb=79fbcfb49f7cc92a89f0158ebac1a3006a559e8a;hpb=02a1bb313c5b39a8ecc48cbd88ebc99be903dc35 diff --git a/src/common/logbacktrace_win.cpp b/src/common/logbacktrace_win.cpp index 779e5cbe..31d1f957 100644 --- a/src/common/logbacktrace_win.cpp +++ b/src/common/logbacktrace_win.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel IRC Team * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -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.