From fc3a3fc173ce4dc04685bb9ced2e0e4faf0fb556 Mon Sep 17 00:00:00 2001
From: Sylvain THESNIERES <garvek@gmail.com>
Date: Fri, 8 Jun 2012 19:55:39 +0200
Subject: [PATCH] MSVC build compliance: - static const float member is not ISO
 - callback do not match DLL signature

---
 apps/openmw/mwgui/settingswindow.hpp    | 8 ++++----
 apps/openmw/mwsound/audiere_decoder.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index ce95edbd2e..e3827c7b03 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -16,10 +16,10 @@ namespace MWGui
             SettingsWindow(WindowManager& parWindowManager);
 
         private:
-            static const float sFovMin = 30;
-            static const float sFovMax = 140;
-            static const float sViewDistMin = 2000;
-            static const float sViewDistMax = 5600;
+            static int const sFovMin = 30;
+            static int const sFovMax = 140;
+            static int const sViewDistMin = 2000;
+            static int const sViewDistMax = 5600;
 
         protected:
             MyGUI::Button* mOkButton;
diff --git a/apps/openmw/mwsound/audiere_decoder.cpp b/apps/openmw/mwsound/audiere_decoder.cpp
index acc2e5283c..4e73573a74 100644
--- a/apps/openmw/mwsound/audiere_decoder.cpp
+++ b/apps/openmw/mwsound/audiere_decoder.cpp
@@ -41,8 +41,8 @@ class OgreFile : public audiere::File
     }
 
     size_t refs;
-    virtual void ref() { ++refs; }
-    virtual void unref()
+    ADR_METHOD(void) ref() { ++refs; }
+    ADR_METHOD(void) unref()
     {
         if(--refs == 0)
             delete this;