Merge branch 'master' of github.com:peterix/dfhack

2011-08-23 15:01:33 +02:00 · 2011-08-23 15:01:33 +02:00 · 122d712a68
parent 4447bcbe34 9f27499e45
commit 122d712a68
2 changed files with 3 additions and 1 deletions
--- a/library/include/dfhack/VersionInfo.h
+++ b/library/include/dfhack/VersionInfo.h
@ -31,7 +31,9 @@ distribution.
 #include "dfhack/Pragma.h"
 #include "dfhack/Export.h"
 #include "dfhack/Types.h"
+#include <maps>
 #include <sys/types.h>
+#include <vector>

 namespace DFHack
 {
--- a/library/include/dfhack/modules/Maps.h
+++ b/library/include/dfhack/modules/Maps.h
@ -35,7 +35,7 @@ distribution.
 #include "dfhack/modules/Vegetation.h"
 #include <vector>
 #include "dfhack/Virtual.h"
-#include <dfhack/BitArray.h>
+#include "dfhack/BitArray.h"

 /**
 * \defgroup grp_maps Maps module and its types