projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
722a0cc
)
silence some warnings
64/head
author
Patrick von Reth
<vonreth@kde.org>
Mon, 17 Mar 2014 15:31:49 +0000
(16:31 +0100)
committer
Patrick von Reth
<vonreth@kde.org>
Mon, 17 Mar 2014 15:31:49 +0000
(16:31 +0100)
src/common/logbacktrace_win.cpp
patch
|
blob
|
history
diff --git
a/src/common/logbacktrace_win.cpp
b/src/common/logbacktrace_win.cpp
index
fd365af
..
26951cd
100644
(file)
--- a/
src/common/logbacktrace_win.cpp
+++ b/
src/common/logbacktrace_win.cpp
@@
-38,6
+38,7
@@
void loadHelpStackFrame(IMAGEHLP_STACK_FRAME &ihsf, const STACKFRAME64 &stackFra
BOOL CALLBACK EnumSymbolsCB(PSYMBOL_INFO symInfo, ULONG size, PVOID user)
{
BOOL CALLBACK EnumSymbolsCB(PSYMBOL_INFO symInfo, ULONG size, PVOID user)
{
+ Q_UNUSED(size)
QStringList *params = (QStringList *)user;
if (symInfo->Flags & SYMFLAG_PARAMETER) {
params->append(symInfo->Name);
QStringList *params = (QStringList *)user;
if (symInfo->Flags & SYMFLAG_PARAMETER) {
params->append(symInfo->Name);
@@
-54,6
+55,7
@@
struct EnumModulesContext {
BOOL CALLBACK EnumModulesCB(LPCSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext)
{
BOOL CALLBACK EnumModulesCB(LPCSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext)
{
+ Q_UNUSED(ModuleName)
IMAGEHLP_MODULE64 mod;
EnumModulesContext *context = (EnumModulesContext *)UserContext;
mod.SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
IMAGEHLP_MODULE64 mod;
EnumModulesContext *context = (EnumModulesContext *)UserContext;
mod.SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
@@
-124,7
+126,7
@@
Label:
StackFrame.AddrFrame.Mode = AddrModeFlat;
StackFrame.AddrStack.Offset = Context.Esp;
StackFrame.AddrStack.Mode = AddrModeFlat;
StackFrame.AddrFrame.Mode = AddrModeFlat;
StackFrame.AddrStack.Offset = Context.Esp;
StackFrame.AddrStack.Mode = AddrModeFlat;
-#elif
_M_X64
+#elif
defined(_M_X64)
MachineType = IMAGE_FILE_MACHINE_AMD64;
StackFrame.AddrPC.Offset = Context.Rip;
StackFrame.AddrPC.Mode = AddrModeFlat;
MachineType = IMAGE_FILE_MACHINE_AMD64;
StackFrame.AddrPC.Offset = Context.Rip;
StackFrame.AddrPC.Mode = AddrModeFlat;
@@
-132,7
+134,7
@@
Label:
StackFrame.AddrFrame.Mode = AddrModeFlat;
StackFrame.AddrStack.Offset = Context.Rsp;
StackFrame.AddrStack.Mode = AddrModeFlat;
StackFrame.AddrFrame.Mode = AddrModeFlat;
StackFrame.AddrStack.Offset = Context.Rsp;
StackFrame.AddrStack.Mode = AddrModeFlat;
-#elif
_M_IA64
+#elif
defined(_M_IA64)
MachineType = IMAGE_FILE_MACHINE_IA64;
StackFrame.AddrPC.Offset = Context.StIIP;
StackFrame.AddrPC.Mode = AddrModeFlat;
MachineType = IMAGE_FILE_MACHINE_IA64;
StackFrame.AddrPC.Offset = Context.StIIP;
StackFrame.AddrPC.Mode = AddrModeFlat;