refactor: Move core/wincompat.hpp to util

diff --git a/cmake/config.h.in b/cmake/config.h.in
index ba6dd9210dc608585d60a85adff01edf3b2a1b93..69b50836880c9e0675c0d2a49afdbf60840eb4bd 100644 (file)
--- 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 3fe992983814ff22b28f74a99d6feaeb5e63e2b3..a1769f58b49eff5df9a4c3906145b017aaace583 100644 (file)
--- 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 f0a583a6784b81b3c1f554e808ebe0d09d40bb0b..9eab8a86978e4c110f51439f3124ac7daaafcd07 100644 (file)
--- 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 0828258195e1bd97217170e27b443b802ca737f2..9a0448bcf2cf5e4c74f0bb8aadda18f234990397 100644 (file)
--- 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 c84670fc66c0570b65f9dfdba68fe7db275bae1d..6e8985f6a770b68e3c6783143114cb5f1bb9d4f3 100644 (file)
--- 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 4c3bfc535db75dcc7ee92b5c8b93202f228f13c5..c9d306b89382d253ead7ae4055d3f73fb6ea3638 100644 (file)
--- 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 7d04b2c5db9dba80ec22482e43324890bf8f227a..3e7e6e320c98a6563bbbe3083d82387fcbec7e08 100644 (file)
--- 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 f3f93f0bf466e55600a1302471b4aacd9ca36330..f42fa35064a7b59e8eeb79542897e957a6b9b1a1 100644 (file)
--- 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 1d3c4f235acb9b39885f094653341c5eb40f5d12..429302f313b1d4c56d14a361542ff3eac10b60c9 100644 (file)
--- 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 c29224b84e101d817c33389dd8a5a1304a58e956..3a4342e99841990536afd7532de4ad81e2a743b8 100644 (file)
--- 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 ec0a17a7d995d18d6897ce4f8f4518f55d87282e..b93983811e728daf389d9ab8536a18f6eb9dc7c6 100644 (file)
--- 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 03f2fe26cb7809aeea28b4c698ad497d08e8a8c0..5c13f8b2cf7d80019dc44ab95f2e4db96900d195 100644 (file)
--- 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 25d2c8b80d1d52d5331702d22e9354f1c80aba8d..9f7dfc6cd2744c4384503e95a6f4951cf6f71fc9 100644 (file)
--- 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 db14fd0d7c0f5d766101f2fd5dd2193153612f8d..f66e382d55063a4acf974500b119bd6f5fa7ed26 100644 (file)
--- 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 01af0986db3d10d0949cd3a8af48487da3996e34..8d16808b05bb72f594106b59198c344e97922853 100644 (file)
--- 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 fe1366ab4bdd888b057ccdff4e49ae108a05c4e4..42c5403a94ccd15c457fdf3bdf177c4079cd58d2 100644 (file)
--- 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 45cf533b23c82dfe7925b110b3eebc8120e2858c..47e22e7f5de026f64ef4531b5564f9219503b7a5 100644 (file)
--- 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 d9b679d6abd7399a052c938ff6963e40db30b4bf..36743e28c96b7aa1c3a5aaf10041a44c62b8d4f3 100644 (file)
--- 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 6312156fa17b824d8ff4ee0af0c53f94041cb680..e75b2757603e8d13e83b1555ce9517c9d9018067 100644 (file)
--- 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 ad185ab17254991a301011680604bad34422c0ac..12a4052eb7f6d889c952fcb1cc31306c2960b570 100644 (file)
--- 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 42fefecd3b4325915c4fd3d3fa04097f94d44c37..2e244da18b80e213dc9641dfe4bfdebdb77a037a 100644 (file)
--- 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 9dc3399e184a26e9e06c89b9cbbf489dd90ecbe1..e6832974cd9170c476c2130646f4974ab1ea0a3e 100644 (file)
--- 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 516fd1398e736ddfe463197f968ffdacb651352f..336ed252ea445b6482533bca6361d8d343c5bc04 100644 (file)
--- 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 b7e74405774bb5d9d656c7e3ba461aee7090196a..f5cd1ec5910409bcf4dc4b3de7057b3edabe48de 100644 (file)
--- 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 a9d250ecf656977b668b491925cd825559cd6c76..2c97fb561e0e2359465b60a18319a42db3fe3e97 100644 (file)
--- 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 0f0a489d895c16dbc9871570cb673b407a96fec6..0cd9add6e5f6115fd8413d6ac74c6b14f3a24a64 100644 (file)
--- 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 1e45d905fe97431294c6e742a1bdc42c8b2024c7..18b04799f65cd387dd908dfc825aa89ea17dacef 100644 (file)
--- 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 c7f27265559fbef0f3a2d7dae7ed5cbd66b5c480..b254c918cc9b6a8877b78ed4f5267dd3b4933758 100644 (file)
--- 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 19a485cca799eb279736a62ef4692c9674977589..7da1844449933d26d55c43bd8bf92ec90783f867 100644 (file)
--- 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 881b06759a0a5e734d2863dfbc5976a64a35672a..6cda0f9ce06984261a3fe463c7a386f5d8e65d0a 100644 (file)
--- 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 cab8cf3d617c0ee09a2cc1f977fa8b52f126767a..9e098bfbd874a27a4375a50af36e15df0dae24ee 100644 (file)
--- 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 c5c30d9c8c08b38b3dc87e5446365475ca9fbc0d..c57aa5d6249d5717864f1d2c60938c09dfef9628 100644 (file)
--- 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"