Fix build errors with clang on Windows (#924)

diff --git a/src/Config.cpp b/src/Config.cpp
index 0ce230313e15da540d75b63b21b0db203636092f..9e9b593ec77ba2e34c4cee0aaea0068402f659f0 100644 (file)
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -55,7 +55,9 @@ using nonstd::optional;
 #  define DLLIMPORT
 #endif
 
+#ifndef environ
 DLLIMPORT extern char** environ;
+#endif
 
 namespace {
 

diff --git a/unittest/test_Win32Util.cpp b/unittest/test_Win32Util.cpp
index f836171c61c7977f3a7cb3917576a95fd70acdce..cff6a7f8161933c0e8b80284d0a705bc5fb96c67 100644 (file)
--- a/unittest/test_Win32Util.cpp
+++ b/unittest/test_Win32Util.cpp
@@ -21,6 +21,8 @@
 
 #include "third_party/doctest.h"
 
+#include <iostream>
+
 TEST_SUITE_BEGIN("Win32Util");
 
 TEST_CASE("Win32Util::argv_to_string")