Merge remote-tracking branch 'origin/master'

artemp · artemp · commit 8e1e5f19d193 · 2015-06-02T15:39:35.000+01:00
diff --git a/include/mapnik/util/file_io.hpp b/include/mapnik/util/file_io.hpp
@@ -27,7 +27,7 @@
 #include <mapnik/util/singleton.hpp>
 #include <mapnik/make_unique.hpp>
 #include <mapnik/util/noncopyable.hpp>
-//#include <mapnik/config.hpp>
+#include <mapnik/util/utf_conv_win.hpp>
 
 // stl
 #include <cstdio>
diff --git a/src/rapidxml_loader.cpp b/src/rapidxml_loader.cpp
@@ -32,6 +32,7 @@
 #include <mapnik/xml_node.hpp>
 #include <mapnik/util/trim.hpp>
 #include <mapnik/util/noncopyable.hpp>
+#include <mapnik/util/utf_conv_win.hpp>
 
 // stl
 #include <iostream>
