From 47c421eb8f1bc69dddcedfb5941602854184bbc3 Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Thu, 10 Jan 2013 03:34:43 +0100
Subject: [PATCH] Some better ifdefs in griffin.c

---
 console/griffin/griffin.c | 10 +++++++---
 xenon/xenon360_input.c    |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index b61a722e77..51f8fe149e 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -156,11 +156,15 @@ VIDEO DRIVER
 #include "../../xdk/xdk_resources.cpp"
 #endif
 
-#if defined(HAVE_OPENGL)
+#ifdef HAVE_OPENGL
 #include "../../gfx/gl.c"
-#elif defined(_XBOX)
+#endif
+
+#ifdef _XBOX
 #include "../../xdk/xdk_d3d.cpp"
-#elif defined(GEKKO)
+#endif
+
+#if defined(GEKKO)
 #include "../../gx/gx_video.c"
 #elif defined(SN_TARGET_PSP2)
 #include "../../vita/vita_video.c"
diff --git a/xenon/xenon360_input.c b/xenon/xenon360_input.c
index 7f3c89bb2f..121524a91c 100644
--- a/xenon/xenon360_input.c
+++ b/xenon/xenon360_input.c
@@ -27,6 +27,7 @@
 #define MAX_PADS
 
 static struct controller_data_s pad[MAX_PADS];
+
 static void xenon360_input_poll(void *data)
 {
    (void)data;