Some changes required on windows.

2011-12-24 14:27:35 +01:00 · 2011-12-24 14:27:35 +01:00 · 59c32b1ee9
parent 5bee16dbd8
commit 59c32b1ee9
2 changed files with 7 additions and 1 deletions
--- 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;

--- 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 {};