Skip to content
Permalink
Browse files

Move tests from SDL_config higher up in Windows joystick/haptic code.

Fixes Bugzilla #2932.
  • Loading branch information
icculus committed May 28, 2015
1 parent 2a75782 commit 58447b24c1989d3992ccce0ac8b18d2de7657b16
@@ -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)
{
@@ -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: */
@@ -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
@@ -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.
*/

0 comments on commit 58447b2

Please sign in to comment.