From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 1 Sep 2021 17:40:02 +0000 (+0300)
Subject: Fix build errors with clang on Windows (#924)
X-Git-Tag: v4.4.1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c27a90239e609844c675229148aee1ce3f14fec9;p=thirdparty%2Fccache.git

Fix build errors with clang on Windows (#924)
---

diff --git a/src/Config.cpp b/src/Config.cpp
index 0ce230313..9e9b593ec 100644
--- 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 f836171c6..cff6a7f81 100644
--- 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")