From 58447b24c1989d3992ccce0ac8b18d2de7657b16 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Thu, 28 May 2015 00:54:52 -0400
Subject: [PATCH] Move tests from SDL_config higher up in Windows
 joystick/haptic code.

Fixes Bugzilla #2932.
---
 src/haptic/windows/SDL_dinputhaptic.c     | 6 ++----
 src/haptic/windows/SDL_xinputhaptic.c     | 6 +++---
 src/joystick/windows/SDL_dinputjoystick.c | 5 ++---
 src/joystick/windows/SDL_xinputjoystick.c | 5 ++---
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/haptic/windows/SDL_dinputhaptic.c b/src/haptic/windows/SDL_dinputhaptic.c
index 564c7db328e9e..21ccace3caf56 100644
--- a/src/haptic/windows/SDL_dinputhaptic.c
+++ b/src/haptic/windows/SDL_dinputhaptic.c
@@ -20,6 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
+#if SDL_HAPTIC_DINPUT
+
 #include "SDL_error.h"
 #include "SDL_stdinc.h"
 #include "SDL_haptic.h"
@@ -29,9 +31,6 @@
 #include "../SDL_syshaptic.h"
 #include "../../joystick/windows/SDL_windowsjoystick_c.h"
 
-
-#if SDL_HAPTIC_DINPUT
-
 /*
  * External stuff.
  */
@@ -1181,7 +1180,6 @@ SDL_DINPUT_HapticStopAll(SDL_Haptic * haptic)
 
 #else /* !SDL_HAPTIC_DINPUT */
 
-
 int
 SDL_DINPUT_HapticInit(void)
 {
diff --git a/src/haptic/windows/SDL_xinputhaptic.c b/src/haptic/windows/SDL_xinputhaptic.c
index 97d95aaae946d..b2c64d798d075 100644
--- a/src/haptic/windows/SDL_xinputhaptic.c
+++ b/src/haptic/windows/SDL_xinputhaptic.c
@@ -20,6 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
+#if SDL_HAPTIC_XINPUT
+
 #include "SDL_assert.h"
 #include "SDL_error.h"
 #include "SDL_haptic.h"
@@ -31,9 +33,6 @@
 #include "../../core/windows/SDL_xinput.h"
 #include "../../joystick/windows/SDL_windowsjoystick_c.h"
 
-
-#if SDL_HAPTIC_XINPUT
-
 /*
  * Internal stuff.
  */
@@ -488,4 +487,5 @@ SDL_XINPUT_HapticStopAll(SDL_Haptic * haptic)
 }
 
 #endif /* SDL_HAPTIC_XINPUT */
+
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/windows/SDL_dinputjoystick.c b/src/joystick/windows/SDL_dinputjoystick.c
index c612cdd5dbd23..476ee9876d8c8 100644
--- a/src/joystick/windows/SDL_dinputjoystick.c
+++ b/src/joystick/windows/SDL_dinputjoystick.c
@@ -20,14 +20,13 @@
 */
 #include "../../SDL_internal.h"
 
+#if SDL_JOYSTICK_DINPUT
+
 #include "../SDL_sysjoystick.h"
 #include "SDL_windowsjoystick_c.h"
 #include "SDL_dinputjoystick_c.h"
 #include "SDL_xinputjoystick_c.h"
 
-
-#if SDL_JOYSTICK_DINPUT
-
 #ifndef DIDFT_OPTIONAL
 #define DIDFT_OPTIONAL      0x80000000
 #endif
diff --git a/src/joystick/windows/SDL_xinputjoystick.c b/src/joystick/windows/SDL_xinputjoystick.c
index da9a2f770aaf6..9042d576c01d1 100644
--- a/src/joystick/windows/SDL_xinputjoystick.c
+++ b/src/joystick/windows/SDL_xinputjoystick.c
@@ -20,15 +20,14 @@
 */
 #include "../../SDL_internal.h"
 
+#if SDL_JOYSTICK_XINPUT
+
 #include "SDL_assert.h"
 #include "SDL_hints.h"
 #include "../SDL_sysjoystick.h"
 #include "SDL_windowsjoystick_c.h"
 #include "SDL_xinputjoystick_c.h"
 
-
-#if SDL_JOYSTICK_XINPUT
-
 /*
  * Internal stuff.
  */