diff --git a/Source/Core/Core/HW/GBACore.cpp b/Source/Core/Core/HW/GBACore.cpp index 1c270281aa..d9f8f8c81a 100644 --- a/Source/Core/Core/HW/GBACore.cpp +++ b/Source/Core/Core/HW/GBACore.cpp @@ -5,9 +5,6 @@ #include "Core/HW/GBACore.h" -#define PYCPARSE // Remove static functions from the header -#include -#undef PYCPARSE #include #include #include diff --git a/Source/Core/Core/HW/GBACore.h b/Source/Core/Core/HW/GBACore.h index 109416e1de..3427f8eb0f 100644 --- a/Source/Core/Core/HW/GBACore.h +++ b/Source/Core/Core/HW/GBACore.h @@ -12,10 +12,8 @@ #include #include -#define PYCPARSE // Remove static functions from the header -#include -#undef PYCPARSE #include +#include #if !defined(_WIN32) #define USE_PTHREADS // Required for Mutex/Condition in mCoreSync. #endif @@ -29,6 +27,7 @@ class GBAHostInterface; class Mixer; class PointerWrap; + namespace Core { class System; @@ -36,11 +35,14 @@ class System; namespace HW::GBA { + class Core; + struct SIODriver : GBASIODriver { Core* core; }; + struct AVStream : mAVStream { Core* core; @@ -170,5 +172,7 @@ private: ::Core::System& m_system; }; + } // namespace HW::GBA + #endif // HAS_LIBMGBA