3 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 05dfb2171..2380c694e 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -52,6 +52,8 @@
 
 #include "debug.h"
 
+#undef ERROR
+
 static const BeingAction::Action actions[] =
 {
     BeingAction::STAND,
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 7cf268b0f..3f2414e9f 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -763,14 +763,14 @@ InventoryWindow *InventoryWindow::getFirstVisible()
 
 void InventoryWindow::nextTab()
 {
-    InventoryWindow *const window = getFirstVisible();
+    const InventoryWindow *const window = getFirstVisible();
     if (window)
         window->mFilter->nextTab();
 }
 
 void InventoryWindow::prevTab()
 {
-    InventoryWindow *const window = getFirstVisible();
+    const InventoryWindow *const window = getFirstVisible();
     if (window)
         window->mFilter->prevTab();
 }
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 5fc5420ee..827bd3550 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -1044,7 +1044,7 @@ bool UpdaterWindow::validateFile(const std::string &filePath,
 unsigned long UpdaterWindow::getFileHash(const std::string &filePath)
 {
     int size = 0;
-    char *const buf = static_cast<char*>(PhysFs::loadFile(filePath, size));
+    const char *const buf = static_cast<const char*>(PhysFs::loadFile(filePath, size));
     if (!buf)
         return 0;
     return Net::Download::adlerBuffer(buf, size);