From ec1c2b16379d657db92c90e25b9e01393267b596 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 14 Sep 2013 18:51:32 +0200
Subject: Clean up preprocessor mingw-isms

No functional changes.
---
 facetracknoir/global-shortcuts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'facetracknoir/global-shortcuts.cpp')

diff --git a/facetracknoir/global-shortcuts.cpp b/facetracknoir/global-shortcuts.cpp
index 286200c0..8666333c 100644
--- a/facetracknoir/global-shortcuts.cpp
+++ b/facetracknoir/global-shortcuts.cpp
@@ -1,6 +1,6 @@
 #include "facetracknoir/facetracknoir.h"
 
-#if defined(__WIN32) || defined(_WIN32)
+#if defined(_WIN32)
 #include <windows.h>
 #include <strmif.h>
 #include <dshow.h>
-- 
cgit v1.2.3


From 2a3dc6a351d4fcd04e50a957b23e638ffa4bea46 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 19 Sep 2013 18:04:09 +0200
Subject: shortcuts: use win32 headers properly

---
 facetracknoir/global-shortcuts.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'facetracknoir/global-shortcuts.cpp')

diff --git a/facetracknoir/global-shortcuts.cpp b/facetracknoir/global-shortcuts.cpp
index 8666333c..e96530ae 100644
--- a/facetracknoir/global-shortcuts.cpp
+++ b/facetracknoir/global-shortcuts.cpp
@@ -2,8 +2,9 @@
 
 #if defined(_WIN32)
 #include <windows.h>
-#include <strmif.h>
-#include <dshow.h>
+#define DIRECTINPUT_VERSION 0x800
+#include <dinput.h>
+
 QList<int> global_windows_key_sequences =
     QList<int>()
     << 0
-- 
cgit v1.2.3


From 65229f5ad8ce2c8e999b0cf181c11383b0a9effb Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 19 Sep 2013 18:08:04 +0200
Subject: don't redefine dinput version that much

---
 facetracknoir/global-shortcuts.cpp | 8 +++++---
 facetracknoir/shortcuts.h          | 2 --
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'facetracknoir/global-shortcuts.cpp')

diff --git a/facetracknoir/global-shortcuts.cpp b/facetracknoir/global-shortcuts.cpp
index e96530ae..1c10b160 100644
--- a/facetracknoir/global-shortcuts.cpp
+++ b/facetracknoir/global-shortcuts.cpp
@@ -1,9 +1,11 @@
 #include "facetracknoir/facetracknoir.h"
 
 #if defined(_WIN32)
-#include <windows.h>
-#define DIRECTINPUT_VERSION 0x800
-#include <dinput.h>
+#   ifndef DIRECTINPUT_VERSION
+#       define DIRECTINPUT_VERSION 0x800
+#   endif
+#   include <windows.h>
+#   include <dinput.h>
 
 QList<int> global_windows_key_sequences =
     QList<int>()
diff --git a/facetracknoir/shortcuts.h b/facetracknoir/shortcuts.h
index 685c78b6..05c36520 100644
--- a/facetracknoir/shortcuts.h
+++ b/facetracknoir/shortcuts.h
@@ -39,8 +39,6 @@ extern QList<int> global_windows_key_sequences;
 #   undef DIRECTINPUT_VERSION
 #   define DIRECTINPUT_VERSION 0x0800
 #   include <windows.h>
-#   undef DIRECTINPUT_VERSION
-#   define DIRECTINPUT_VERSION 0x0800
 #   include <dinput.h>
 
 struct Key {
-- 
cgit v1.2.3