From c3388602bb56b0a6acf063ee6bbcb01a422eb6f7 Mon Sep 17 00:00:00 2001
From: Brandon Wright <bearoso@gmail.com>
Date: Tue, 16 Jul 2019 11:16:10 -0500
Subject: [PATCH] gtk: Undef vector and bool after SDL.h

---
 gtk/src/gtk_control.cpp        | 1 -
 gtk/src/gtk_control.h          | 3 +++
 gtk/src/gtk_sound_driver_sdl.h | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gtk/src/gtk_control.cpp b/gtk/src/gtk_control.cpp
index 9433c580..c4442bc8 100644
--- a/gtk/src/gtk_control.cpp
+++ b/gtk/src/gtk_control.cpp
@@ -5,7 +5,6 @@
 \*****************************************************************************/
 
 #include <fcntl.h>
-#include "SDL.h"
 
 #include "gtk_s9xcore.h"
 #include "gtk_s9x.h"
diff --git a/gtk/src/gtk_control.h b/gtk/src/gtk_control.h
index 439c8a78..95ef733b 100644
--- a/gtk/src/gtk_control.h
+++ b/gtk/src/gtk_control.h
@@ -11,6 +11,9 @@
 
 #include "gtk_binding.h"
 #include "SDL.h"
+// SDL.h may include altivec.h which redefines vector and bool
+#undef vector
+#undef bool
 
 const int NUM_JOYPADS = 10;
 
diff --git a/gtk/src/gtk_sound_driver_sdl.h b/gtk/src/gtk_sound_driver_sdl.h
index b318e069..f9115c4f 100644
--- a/gtk/src/gtk_sound_driver_sdl.h
+++ b/gtk/src/gtk_sound_driver_sdl.h
@@ -8,6 +8,8 @@
 #define __GTK_SOUND_DRIVER_SDL_H
 
 #include "SDL.h"
+#undef vector
+#undef bool
 
 #include "gtk_sound.h"
 #include "gtk_sound_driver.h"