diff --git a/library/DataDefs.cpp b/library/DataDefs.cpp index 2de8c156e..7b4af8479 100644 --- a/library/DataDefs.cpp +++ b/library/DataDefs.cpp @@ -30,9 +30,10 @@ distribution. #include "dfhack/Process.h" #include "dfhack/Core.h" -#include "dfhack/DataDefs.h" #include "dfhack/VersionInfo.h" #include "tinythread.h" +// must be last due to MS stupidity +#include "dfhack/DataDefs.h" using namespace DFHack; diff --git a/library/include/dfhack/DataDefs.h b/library/include/dfhack/DataDefs.h index aa325958c..5ffd9be7e 100644 --- a/library/include/dfhack/DataDefs.h +++ b/library/include/dfhack/DataDefs.h @@ -31,6 +31,11 @@ distribution. #include "dfhack/Core.h" #include "dfhack/BitArray.h" +// Stop some MS stupidity +#ifdef interface + #undef interface +#endif + namespace DFHack { class virtual_class {};