ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gtk: Undef vector and bool after SDL.h

This commit is contained in:
Brandon Wright 2019-07-16 11:16:10 -05:00
parent 683bba5b77
commit c3388602bb
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/src/gtk_control.cpp
View File

@ -5,7 +5,6 @@
\*****************************************************************************/
#include <fcntl.h>
#include "SDL.h"
#include "gtk_s9xcore.h"
#include "gtk_s9x.h"

3
gtk/src/gtk_control.h
View File

@ -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;

2
gtk/src/gtk_sound_driver_sdl.h
View File

@ -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"