From 9729af15e9138493e435b8db46e89180f5bfb5c2 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 24 Jul 2017 03:25:41 +0200
Subject: dinput: less boilerplate

---
 dinput/dinput.hpp         | 15 ++-------------
 logic/win32-shortcuts.cpp |  5 ++---
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/dinput/dinput.hpp b/dinput/dinput.hpp
index 86828b00..fc73a90a 100644
--- a/dinput/dinput.hpp
+++ b/dinput/dinput.hpp
@@ -10,21 +10,10 @@
 
 #include "export.hpp"
 
-#ifdef Q_MOC_RUN
-typedef void* LPDIRECTINPUT8;
-#else
-#ifndef DIRECTINPUT_VERSION
-#   define DIRECTINPUT_VERSION 0x800
+#undef DIRECTINPUT_VERSION
+#define DIRECTINPUT_VERSION 0x800
 #include <dinput.h>
-#endif
 #include <atomic>
-#endif
-
-#if defined(_MSC_VER)
-#   if defined BUILD_DINPUT
-        template struct __declspec(dllexport) std::atomic<int>;
-#   endif
-#endif
 
 class OTR_DINPUT_EXPORT dinput_handle final
 {
diff --git a/logic/win32-shortcuts.cpp b/logic/win32-shortcuts.cpp
index af50b949..15e87877 100644
--- a/logic/win32-shortcuts.cpp
+++ b/logic/win32-shortcuts.cpp
@@ -7,9 +7,8 @@
  */
 
 #if defined(_WIN32)
-#   ifndef DIRECTINPUT_VERSION
-#       define DIRECTINPUT_VERSION 0x800
-#   endif
+#   undef DIRECTINPUT_VERSION
+#   define DIRECTINPUT_VERSION 0x800
 #   include <dinput.h>
 
 #include "win32-shortcuts.h"
-- 
cgit v1.2.3