Merge branch 'kintel-cpuinfo' of github.com:openscad/openscad into ki…

…ntel-cpuinfo
openscad · Mar 30, 2023 · 36d7092 · 36d7092
2 parents 42029bb + e6cd803
commit 36d7092
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/glview/OffscreenContextWGL.cc b/src/glview/OffscreenContextWGL.cc
@@ -24,6 +24,7 @@
 #include <map>
 #include <string>
 #include <sstream>
+#include <strstream>
 
 struct OffscreenContext
 {

diff --git a/src/platform/PlatformUtils-win.cc b/src/platform/PlatformUtils-win.cc
@@ -1,4 +1,7 @@
 #include "PlatformUtils.h"
+
+#include <map>
+
 #include "printutils.h"
 #include "findversion.h"
 #ifndef _WIN32_WINNT
@@ -170,7 +173,7 @@ const std::string PlatformUtils::sysinfo(bool extended)
       majorVersion = 11;
     }
     boost::format fmt("Microsoft Windows %d (%d.%d.%d) %s");
-    fmt % majorVersion % osinfo.dwMajorVersion % osinfo.dwMinorVersion % osinfo.dwBuildNumber % archs[si.wProcessorArchitecture]
+    fmt % majorVersion % osinfo.dwMajorVersion % osinfo.dwMinorVersion % osinfo.dwBuildNumber % archs[si.wProcessorArchitecture];
     result += fmt.str();
   }