From 7f034685158889306dc34c62ef37ab4a695ae891 Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Thu, 27 Jul 2023 22:05:27 +0200
Subject: [PATCH] refactor: Move core/wincompat.hpp to util

---
 cmake/config.h.in                   | 2 +-
 src/Config.cpp                      | 2 +-
 src/Context.cpp                     | 2 +-
 src/Fd.cpp                          | 2 +-
 src/Hash.cpp                        | 2 +-
 src/Logging.cpp                     | 2 +-
 src/MiniTrace.cpp                   | 2 +-
 src/ProgressBar.cpp                 | 2 +-
 src/Stat.cpp                        | 2 +-
 src/Stat.hpp                        | 2 +-
 src/Util.cpp                        | 2 +-
 src/Win32Util.hpp                   | 2 +-
 src/argprocessing.cpp               | 2 +-
 src/ccache.cpp                      | 2 +-
 src/core/Result.cpp                 | 2 +-
 src/core/ResultExtractor.cpp        | 2 +-
 src/core/ResultRetriever.cpp        | 2 +-
 src/execute.cpp                     | 2 +-
 src/hashutil.cpp                    | 2 +-
 src/storage/local/LocalStorage.cpp  | 2 +-
 src/storage/remote/RedisStorage.cpp | 2 +-
 src/util/LockFile.cpp               | 2 +-
 src/util/environment.cpp            | 2 +-
 src/util/filesystem.cpp             | 2 +-
 src/util/process.cpp                | 2 +-
 src/{core => util}/wincompat.hpp    | 0
 unittest/TestUtil.cpp               | 2 +-
 unittest/test_Stat.cpp              | 2 +-
 unittest/test_Util.cpp              | 2 +-
 unittest/test_argprocessing.cpp     | 2 +-
 unittest/test_bsdmkstemp.cpp        | 2 +-
 unittest/test_ccache.cpp            | 2 +-
 unittest/test_util_LockFile.cpp     | 2 +-
 33 files changed, 32 insertions(+), 32 deletions(-)
 rename src/{core => util}/wincompat.hpp (100%)

diff --git a/cmake/config.h.in b/cmake/config.h.in
index ba6dd9210..69b508368 100644
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -172,7 +172,7 @@
 #endif
 
 // Typedefs that make it possible to use common types in ccache header files
-// without including core/wincompat.hpp.
+// without including util/wincompat.hpp.
 #ifdef _WIN32
 #  ifdef _MSC_VER
 typedef unsigned __int32 mode_t;
diff --git a/src/Config.cpp b/src/Config.cpp
index 3fe992983..a1769f58b 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -27,7 +27,6 @@
 #include <core/common.hpp>
 #include <core/exceptions.hpp>
 #include <core/types.hpp>
-#include <core/wincompat.hpp>
 #include <fmtmacros.hpp>
 #include <util/Tokenizer.hpp>
 #include <util/UmaskScope.hpp>
@@ -37,6 +36,7 @@
 #include <util/filesystem.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
+#include <util/wincompat.hpp>
 
 #include "third_party/fmt/core.h"
 
diff --git a/src/Context.cpp b/src/Context.cpp
index f0a583a67..9eab8a869 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -24,11 +24,11 @@
 #include "hashutil.hpp"
 
 #include <Win32Util.hpp>
-#include <core/wincompat.hpp>
 #include <util/TimePoint.hpp>
 #include <util/path.hpp>
 #include <util/process.hpp>
 #include <util/string.hpp>
+#include <util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/src/Fd.cpp b/src/Fd.cpp
index 082825819..9a0448bcf 100644
--- a/src/Fd.cpp
+++ b/src/Fd.cpp
@@ -18,7 +18,7 @@
 
 #include "Fd.hpp"
 
-#include <core/wincompat.hpp>
+#include <util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/src/Hash.cpp b/src/Hash.cpp
index c84670fc6..6e8985f6a 100644
--- a/src/Hash.cpp
+++ b/src/Hash.cpp
@@ -22,9 +22,9 @@
 #include "Logging.hpp"
 #include "fmtmacros.hpp"
 
-#include <core/wincompat.hpp>
 #include <util/file.hpp>
 #include <util/string.hpp>
+#include <util/wincompat.hpp>
 
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/src/Logging.cpp b/src/Logging.cpp
index 4c3bfc535..c9d306b89 100644
--- a/src/Logging.cpp
+++ b/src/Logging.cpp
@@ -26,9 +26,9 @@
 #include "execute.hpp"
 #include "fmtmacros.hpp"
 
-#include <core/wincompat.hpp>
 #include <util/file.hpp>
 #include <util/time.hpp>
+#include <util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/src/MiniTrace.cpp b/src/MiniTrace.cpp
index 7d04b2c5d..3e7e6e320 100644
--- a/src/MiniTrace.cpp
+++ b/src/MiniTrace.cpp
@@ -22,10 +22,10 @@
 #include "TemporaryFile.hpp"
 #include "fmtmacros.hpp"
 
-#include <core/wincompat.hpp>
 #include <util/TimePoint.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
+#include <util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/src/ProgressBar.cpp b/src/ProgressBar.cpp
index f3f93f0bf..f42fa3506 100644
--- a/src/ProgressBar.cpp
+++ b/src/ProgressBar.cpp
@@ -21,7 +21,7 @@
 #include "fmtmacros.hpp"
 
 #include <assertions.hpp>
-#include <core/wincompat.hpp>
+#include <util/wincompat.hpp>
 
 #include "third_party/fmt/core.h"
 
diff --git a/src/Stat.cpp b/src/Stat.cpp
index 1d3c4f235..429302f31 100644
--- a/src/Stat.cpp
+++ b/src/Stat.cpp
@@ -23,8 +23,8 @@
 #include "Win32Util.hpp"
 
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <fmtmacros.hpp>
+#include <util/wincompat.hpp>
 
 #ifdef _WIN32
 #  include <third_party/win32/winerror_to_errno.h>
diff --git a/src/Stat.hpp b/src/Stat.hpp
index c29224b84..3a4342e99 100644
--- a/src/Stat.hpp
+++ b/src/Stat.hpp
@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include <core/wincompat.hpp>
 #include <util/TimePoint.hpp>
 #include <util/file.hpp>
+#include <util/wincompat.hpp>
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/Util.cpp b/src/Util.cpp
index ec0a17a7d..b93983811 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -29,13 +29,13 @@
 #include <Finalizer.hpp>
 #include <Stat.hpp>
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <fmtmacros.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
+#include <util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/src/Win32Util.hpp b/src/Win32Util.hpp
index 03f2fe26c..5c13f8b2c 100644
--- a/src/Win32Util.hpp
+++ b/src/Win32Util.hpp
@@ -20,7 +20,7 @@
 
 #ifdef _WIN32
 
-#  include <core/wincompat.hpp>
+#  include <util/wincompat.hpp>
 
 #  include <string>
 
diff --git a/src/argprocessing.cpp b/src/argprocessing.cpp
index 25d2c8b80..9f7dfc6cd 100644
--- a/src/argprocessing.cpp
+++ b/src/argprocessing.cpp
@@ -27,8 +27,8 @@
 
 #include <Depfile.hpp>
 #include <Util.hpp>
-#include <core/wincompat.hpp>
 #include <util/string.hpp>
+#include <util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/src/ccache.cpp b/src/ccache.cpp
index db14fd0d7..f66e382d5 100644
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -52,7 +52,6 @@
 #include <core/exceptions.hpp>
 #include <core/mainoptions.hpp>
 #include <core/types.hpp>
-#include <core/wincompat.hpp>
 #include <storage/Storage.hpp>
 #include <util/UmaskScope.hpp>
 #include <util/environment.hpp>
@@ -63,6 +62,7 @@
 #include <util/process.hpp>
 #include <util/string.hpp>
 #include <util/time.hpp>
+#include <util/wincompat.hpp>
 
 #include "third_party/fmt/core.h"
 
diff --git a/src/core/Result.cpp b/src/core/Result.cpp
index 01af0986d..8d16808b0 100644
--- a/src/core/Result.cpp
+++ b/src/core/Result.cpp
@@ -31,13 +31,13 @@
 #include <core/CacheEntryDataWriter.hpp>
 #include <core/Statistic.hpp>
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
+#include <util/wincompat.hpp>
 
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/src/core/ResultExtractor.cpp b/src/core/ResultExtractor.cpp
index fe1366ab4..42c5403a9 100644
--- a/src/core/ResultExtractor.cpp
+++ b/src/core/ResultExtractor.cpp
@@ -23,11 +23,11 @@
 
 #include <Stat.hpp>
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <fmtmacros.hpp>
 #include <util/Bytes.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
+#include <util/wincompat.hpp>
 
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/src/core/ResultRetriever.cpp b/src/core/ResultRetriever.cpp
index 45cf533b2..47e22e7f5 100644
--- a/src/core/ResultRetriever.cpp
+++ b/src/core/ResultRetriever.cpp
@@ -28,11 +28,11 @@
 #include <core/MsvcShowIncludesOutput.hpp>
 #include <core/common.hpp>
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <fmtmacros.hpp>
 #include <util/expected.hpp>
 #include <util/file.hpp>
 #include <util/string.hpp>
+#include <util/wincompat.hpp>
 
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/src/execute.cpp b/src/execute.cpp
index d9b679d6a..36743e28c 100644
--- a/src/execute.cpp
+++ b/src/execute.cpp
@@ -31,11 +31,11 @@
 
 #include <ccache.hpp>
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <fmtmacros.hpp>
 #include <util/file.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
+#include <util/wincompat.hpp>
 
 #include <vector>
 
diff --git a/src/hashutil.cpp b/src/hashutil.cpp
index 6312156fa..e75b27576 100644
--- a/src/hashutil.cpp
+++ b/src/hashutil.cpp
@@ -28,11 +28,11 @@
 #include "macroskip.hpp"
 
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <fmtmacros.hpp>
 #include <util/file.hpp>
 #include <util/string.hpp>
 #include <util/time.hpp>
+#include <util/wincompat.hpp>
 
 #ifdef INODE_CACHE_SUPPORTED
 #  include "InodeCache.hpp"
diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp
index ad185ab17..12a4052eb 100644
--- a/src/storage/local/LocalStorage.cpp
+++ b/src/storage/local/LocalStorage.cpp
@@ -34,7 +34,6 @@
 #include <core/Statistics.hpp>
 #include <core/common.hpp>
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <fmtmacros.hpp>
 #include <util/Duration.hpp>
 #include <util/TextTable.hpp>
@@ -43,6 +42,7 @@
 #include <util/filesystem.hpp>
 #include <util/process.hpp>
 #include <util/string.hpp>
+#include <util/wincompat.hpp>
 
 #ifdef INODE_CACHE_SUPPORTED
 #  include <InodeCache.hpp>
diff --git a/src/storage/remote/RedisStorage.cpp b/src/storage/remote/RedisStorage.cpp
index 42fefecd3..2e244da18 100644
--- a/src/storage/remote/RedisStorage.cpp
+++ b/src/storage/remote/RedisStorage.cpp
@@ -22,10 +22,10 @@
 #include <Logging.hpp>
 #include <assertions.hpp>
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp> // for timeval
 #include <fmtmacros.hpp>
 #include <util/expected.hpp>
 #include <util/string.hpp>
+#include <util/wincompat.hpp> // for timeval
 
 #ifdef HAVE_SYS_UTIME_H
 #  include <sys/utime.h> // for timeval
diff --git a/src/util/LockFile.cpp b/src/util/LockFile.cpp
index 9dc3399e1..e6832974c 100644
--- a/src/util/LockFile.cpp
+++ b/src/util/LockFile.cpp
@@ -26,10 +26,10 @@
 #include <Stat.hpp>
 #include <assertions.hpp>
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
 #include <util/process.hpp>
+#include <util/wincompat.hpp>
 
 #include "third_party/fmt/core.h"
 
diff --git a/src/util/environment.cpp b/src/util/environment.cpp
index 516fd1398..336ed252e 100644
--- a/src/util/environment.cpp
+++ b/src/util/environment.cpp
@@ -19,8 +19,8 @@
 #include "environment.hpp"
 
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <fmtmacros.hpp>
+#include <util/wincompat.hpp>
 
 namespace util {
 
diff --git a/src/util/filesystem.cpp b/src/util/filesystem.cpp
index b7e744057..f5cd1ec59 100644
--- a/src/util/filesystem.cpp
+++ b/src/util/filesystem.cpp
@@ -18,7 +18,7 @@
 
 #include "filesystem.hpp"
 
-#include <core/wincompat.hpp>
+#include <util/wincompat.hpp>
 
 namespace util::filesystem {
 
diff --git a/src/util/process.cpp b/src/util/process.cpp
index a9d250ecf..2c97fb561 100644
--- a/src/util/process.cpp
+++ b/src/util/process.cpp
@@ -18,7 +18,7 @@
 
 #include "process.hpp"
 
-#include <core/wincompat.hpp>
+#include <util/wincompat.hpp>
 
 #include <cstring>
 
diff --git a/src/core/wincompat.hpp b/src/util/wincompat.hpp
similarity index 100%
rename from src/core/wincompat.hpp
rename to src/util/wincompat.hpp
diff --git a/unittest/TestUtil.cpp b/unittest/TestUtil.cpp
index 0f0a489d8..0cd9add6e 100644
--- a/unittest/TestUtil.cpp
+++ b/unittest/TestUtil.cpp
@@ -21,10 +21,10 @@
 #include "../src/Util.hpp"
 
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <fmtmacros.hpp>
 #include <util/filesystem.hpp>
 #include <util/path.hpp>
+#include <util/wincompat.hpp>
 
 #ifdef HAVE_UNISTD_H
 #  include <unistd.h>
diff --git a/unittest/test_Stat.cpp b/unittest/test_Stat.cpp
index 1e45d905f..18b04799f 100644
--- a/unittest/test_Stat.cpp
+++ b/unittest/test_Stat.cpp
@@ -22,9 +22,9 @@
 #include "TestUtil.hpp"
 
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <util/environment.hpp>
 #include <util/file.hpp>
+#include <util/wincompat.hpp>
 
 #include "third_party/doctest.h"
 
diff --git a/unittest/test_Util.cpp b/unittest/test_Util.cpp
index c7f272655..b254c918c 100644
--- a/unittest/test_Util.cpp
+++ b/unittest/test_Util.cpp
@@ -24,11 +24,11 @@
 
 #include <Stat.hpp>
 #include <core/exceptions.hpp>
-#include <core/wincompat.hpp>
 #include <util/environment.hpp>
 #include <util/file.hpp>
 #include <util/filesystem.hpp>
 #include <util/path.hpp>
+#include <util/wincompat.hpp>
 
 #include "third_party/doctest.h"
 
diff --git a/unittest/test_argprocessing.cpp b/unittest/test_argprocessing.cpp
index 19a485cca..7da184444 100644
--- a/unittest/test_argprocessing.cpp
+++ b/unittest/test_argprocessing.cpp
@@ -25,10 +25,10 @@
 
 #include <Util.hpp>
 #include <core/Statistic.hpp>
-#include <core/wincompat.hpp>
 #include <util/file.hpp>
 #include <util/path.hpp>
 #include <util/string.hpp>
+#include <util/wincompat.hpp>
 
 #include "third_party/doctest.h"
 
diff --git a/unittest/test_bsdmkstemp.cpp b/unittest/test_bsdmkstemp.cpp
index 881b06759..6cda0f9ce 100644
--- a/unittest/test_bsdmkstemp.cpp
+++ b/unittest/test_bsdmkstemp.cpp
@@ -20,7 +20,7 @@
 #include "../src/Finalizer.hpp"
 #include "TestUtil.hpp"
 
-#include <core/wincompat.hpp>
+#include <util/wincompat.hpp>
 
 #include "third_party/doctest.h"
 #include "third_party/win32/mktemp.h"
diff --git a/unittest/test_ccache.cpp b/unittest/test_ccache.cpp
index cab8cf3d6..9e098bfbd 100644
--- a/unittest/test_ccache.cpp
+++ b/unittest/test_ccache.cpp
@@ -21,9 +21,9 @@
 #include "../src/fmtmacros.hpp"
 #include "TestUtil.hpp"
 
-#include <core/wincompat.hpp>
 #include <util/file.hpp>
 #include <util/path.hpp>
+#include <util/wincompat.hpp>
 
 #include "third_party/doctest.h"
 
diff --git a/unittest/test_util_LockFile.cpp b/unittest/test_util_LockFile.cpp
index c5c30d9c8..c57aa5d62 100644
--- a/unittest/test_util_LockFile.cpp
+++ b/unittest/test_util_LockFile.cpp
@@ -20,9 +20,9 @@
 #include "TestUtil.hpp"
 
 #include <Util.hpp>
-#include <core/wincompat.hpp>
 #include <util/LockFile.hpp>
 #include <util/file.hpp>
+#include <util/wincompat.hpp>
 
 #include "third_party/doctest.h"
 
-- 
2.47.2