From 490bac7421b5345e5b9035f1430520c751935534 Mon Sep 17 00:00:00 2001
From: Wohlstand <admin@wohlnet.ru>
Date: Sat, 21 Oct 2017 14:37:45 +0300
Subject: Fixed MSVC2015 build

---
 src/adlmidi_private.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/adlmidi_private.hpp')

diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp
index c33a4d9..cb91616 100644
--- a/src/adlmidi_private.hpp
+++ b/src/adlmidi_private.hpp
@@ -44,6 +44,7 @@
         #else
             typedef __int32 ssize_t;
         #endif
+        #define NOMINMAX //Don't override std::min and std::max
     #endif
     #include <windows.h>
 #endif
@@ -352,7 +353,7 @@ public:
             fp = std::fopen(path, "rb");
             #else
             wchar_t widePath[MAX_PATH];
-            int size = MultiByteToWideChar(CP_UTF8, 0, path, std::strlen(path), widePath, MAX_PATH);
+            int size = MultiByteToWideChar(CP_UTF8, 0, path, (int)std::strlen(path), widePath, MAX_PATH);
             widePath[size] = '\0';
             fp = _wfopen(widePath, L"rb");
             #endif
@@ -396,7 +397,7 @@ public:
             }
         }
 
-        inline void seeku(unsigned long pos, int rel_to)
+        inline void seeku(uint64_t pos, int rel_to)
         {
             seek(static_cast<long>(pos), rel_to);
         }
-- 
cgit v1.2.3