From 06f5ec54da4efb1383298da7c2d20805c5304dd1 Mon Sep 17 00:00:00 2001
From: "SND\\edgbla_cp" <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 29 Aug 2013 22:14:32 +0000
Subject: SDL2/SDL1.2 (Linux);

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87020 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 plugins/dfinput/sdljoy.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/dfinput/sdljoy.c')

diff --git a/plugins/dfinput/sdljoy.c b/plugins/dfinput/sdljoy.c
index 7d0dad71..2a763935 100755
--- a/plugins/dfinput/sdljoy.c
+++ b/plugins/dfinput/sdljoy.c
@@ -18,13 +18,13 @@
 
 #include "pad.h"
 
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
 static SDL_HapticEffect haptic_rumbleEffect;
 #endif
 
 void JoyInitHaptic()
 {
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
   uint8_t i;
     //unsigned int haptic_query = 0;
   for (i = 0; i < 2; i++)
@@ -61,7 +61,7 @@ void JoyInitHaptic()
 
 int JoyHapticRumble(int pad, uint32_t low, uint32_t high)
 {
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
   float mag;
 
   if (g.PadState[pad].haptic) {
@@ -99,13 +99,13 @@ void InitSDLJoy() {
 		} else {
 			g.PadState[i].JoyDev = NULL;
 		}
-#if !SDL_VERSION_ATLEAST(1,3,0) && defined(__linux__)
+#if !SDL_VERSION_ATLEAST(2,0,0) && defined(__linux__)
 		g.PadState[i].VibrateDev = -1;
 		g.PadState[i].VibrateEffect = -1;
 #endif
 	}
 
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
   if (has_haptic)
   {
     JoyInitHaptic();
@@ -127,7 +127,7 @@ void DestroySDLJoy() {
 	if (SDL_WasInit(SDL_INIT_JOYSTICK)) {
 		for (i = 0; i < 2; i++) {
 			if (g.PadState[i].JoyDev != NULL) {
-#if SDL_VERSION_ATLEAST(1,3,0)
+#if SDL_VERSION_ATLEAST(2,0,0)
         if (g.PadState[i].haptic != NULL)
         {
           SDL_HapticClose(g.PadState[i].haptic);
-- 
cgit v1.2.3