EmuKrnlLogging: Work around EXCEPTION_DISPOSITION macros in MinGW

This commit is contained in:
darkf 2020-04-07 01:45:25 -07:00
parent 1309f25c7b
commit 21733cc594
1 changed files with 11 additions and 1 deletions

View File

@ -28,7 +28,6 @@
// prevent name collisions
namespace xboxkrnl
{
#include <xboxkrnl/xboxkrnl.h>
// Additional types, exclusively for logging (not really enums) :
enum ALLOCATION_TYPE : int;
@ -44,6 +43,17 @@ enum PROTECTION_TYPE : int;
#include <sstream> // for std::ostream
#include "Logging.h"
// MinGW defines these as macros, which cause issues with overloads
#ifdef EXCEPTION_DISPOSITION
#undef EXCEPTION_DISPOSITION
#undef ExceptionContinueExecution
#undef ExceptionContinueSearch
#undef ExceptionNestedException
#undef ExceptionCollidedUnwind
#endif
#include <xboxkrnl/xboxkrnl.h>
// prevent name collisions
namespace xboxkrnl
{