X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogbacktrace_win.cpp;h=f6d922bd246ef2406edb75c5bd98b4701ec7f1b9;hp=06a6f80e2fc672d7cbb9a66f4ac08c44acd52880;hb=0dbec2cfc937857d66a9645249f876f1e6b3f05e;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/common/logbacktrace_win.cpp b/src/common/logbacktrace_win.cpp
index 06a6f80e..f6d922bd 100644
--- a/src/common/logbacktrace_win.cpp
+++ b/src/common/logbacktrace_win.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "quassel.h"
@@ -38,6 +38,7 @@ void loadHelpStackFrame(IMAGEHLP_STACK_FRAME &ihsf, const STACKFRAME64 &stackFra
 
 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);
@@ -54,6 +55,7 @@ struct EnumModulesContext {
 
 BOOL CALLBACK EnumModulesCB(LPCSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext)
 {
+    Q_UNUSED(ModuleName)
     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;
-#elif _M_X64
+#elif defined(_M_X64)
     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;
-#elif _M_IA64
+#elif defined(_M_IA64)
     MachineType                 = IMAGE_FILE_MACHINE_IA64;
     StackFrame.AddrPC.Offset    = Context.StIIP;
     StackFrame.AddrPC.Mode      = AddrModeFlat;