From 57b8a511b8ab198109ac23ecb7ac54af7fed34d9 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 17 Feb 2016 23:04:03 -0800
Subject: [PATCH] SDL: Fix SDL 1.2 build

---
 src/platform/sdl/sdl-events.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/platform/sdl/sdl-events.h b/src/platform/sdl/sdl-events.h
index 015868f2e..387871b58 100644
--- a/src/platform/sdl/sdl-events.h
+++ b/src/platform/sdl/sdl-events.h
@@ -23,11 +23,13 @@ struct GBAVideoSoftwareRenderer;
 struct Configuration;
 
 struct SDL_JoystickCombo {
-	SDL_JoystickID id;
 	size_t index;
 	SDL_Joystick* joystick;
 #if SDL_VERSION_ATLEAST(2, 0, 0)
 	SDL_Haptic* haptic;
+	SDL_JoystickID id;
+#else
+	int id;
 #endif
 };