From eba14241fe23d0561687a1e530a57fa0bfc6ab69 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 3 Dec 2012 09:13:32 +0100
Subject: Some minor changes to solve compilation problems after last merge

---
 xorg-server/hw/xwin/propertystore.h        | 2 +-
 xorg-server/hw/xwin/winSetAppUserModelID.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'xorg-server/hw')

diff --git a/xorg-server/hw/xwin/propertystore.h b/xorg-server/hw/xwin/propertystore.h
index 6afc6c954..b4a761f51 100644
--- a/xorg-server/hw/xwin/propertystore.h
+++ b/xorg-server/hw/xwin/propertystore.h
@@ -26,7 +26,7 @@
 
 #include <windows.h>
 
-#ifdef __MINGW64_VERSION_MAJOR
+#if defined(__MINGW64_VERSION_MAJOR) || defined(_MSC_VER)
 /* If we are using headers from mingw-w64 project, it provides the PSDK headers this needs ... */
 #include <propkey.h>
 #include <propsys.h>
diff --git a/xorg-server/hw/xwin/winSetAppUserModelID.c b/xorg-server/hw/xwin/winSetAppUserModelID.c
index ce9da5e7d..41615e19c 100644
--- a/xorg-server/hw/xwin/winSetAppUserModelID.c
+++ b/xorg-server/hw/xwin/winSetAppUserModelID.c
@@ -28,6 +28,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xwindows.h>
+#include <pthread.h>
 #include "winwindow.h"
 #include "os.h"
 #include "winmsg.h"
-- 
cgit v1.2.3