untwine: apply hobuinc/untwine#59 and hobuinc/untwine@c7f94c1593badf2…

…7fb5ef9 (refs #42904)
qgis · Apr 22, 2021 · 7243cb6 · 7243cb6
1 parent 0ca7527
commit 7243cb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/external/untwine/api/QgisUntwine.cpp b/external/untwine/api/QgisUntwine.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <algorithm>
 
 #include "QgisUntwine.hpp"
 

diff --git a/external/untwine/untwine/MapFile.cpp b/external/untwine/untwine/MapFile.cpp
@@ -49,10 +49,10 @@ MapContext mapFile(const std::string& filename, bool readOnly,
         return ctx;
     }
 
-#ifndef WIN32
+#ifndef _WIN32
     ctx.m_fd = ::open(filename.c_str(), readOnly ? O_RDONLY : O_RDWR);
 #else
-    ctx.m_fd = ::_open(filename.c_str(), readOnly ? O_RDONLY : O_RDWR);
+    ctx.m_fd = ::_open(filename.c_str(), readOnly ? _O_RDONLY : _O_RDWR);
 #endif
 
     if (ctx.m_fd == -1)