summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os/windows/win32.cpp1
-rw-r--r--src/video/win32_v.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp
index bb1a0a420..a84347ed1 100644
--- a/src/os/windows/win32.cpp
+++ b/src/os/windows/win32.cpp
@@ -17,6 +17,7 @@
#include <windows.h>
#include <fcntl.h>
#include <regstr.h>
+#define NO_SHOBJIDL_SORTDIRECTION // Avoid multiple definition of SORT_ASCENDING
#include <shlobj.h> /* SHGetFolderPath */
#include <shellapi.h>
#include "win32.h"
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index 0655065a6..29a065720 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -238,7 +238,7 @@ int RedrawScreenDebug()
#define TID_POLLMOUSE 1
#define MOUSE_POLL_DELAY 75
-static void CALLBACK TrackMouseTimerProc(HWND hwnd, UINT msg, UINT event, DWORD time)
+static void CALLBACK TrackMouseTimerProc(HWND hwnd, UINT msg, UINT_PTR event, DWORD time)
{
RECT rc;
POINT pt;