Windows define and include restructuring (#492)

Set the _WIN32_WINNT macro only once in the generated config.h.

Include <windows.h> only once in system.hpp, unless these includes
are in third party libs - however third party includes themselves
should always be behind internal includes. Therefore also make
system.hpp the first include everywhere.

diff --git a/src/CacheEntryWriter.hpp b/src/CacheEntryWriter.hpp
index 338aa173b052a10b4794ed9df91fe480e872498f..711035810c118cf6f810fea773db2f05af368af5 100644 (file)
--- a/src/CacheEntryWriter.hpp
+++ b/src/CacheEntryWriter.hpp
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "system.hpp"
+
 #include "Checksum.hpp"
 #include "Compressor.hpp"
 #include "Util.hpp"

diff --git a/src/CacheFile.hpp b/src/CacheFile.hpp
index 696458fe99cd1a006e6600344840d32fd0c9dd1f..0c98d337d4ab59b7e1bbde8d6db49452cad1988a 100644 (file)
--- a/src/CacheFile.hpp
+++ b/src/CacheFile.hpp
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "system.hpp"
+
 #include "Error.hpp"
 #include "Stat.hpp"
 

diff --git a/src/Compressor.hpp b/src/Compressor.hpp
index 2cc1fc0e52ae841496c904bd7ebc2ede7bdbc22b..3295874c5084323cc43f55e2283383ab1d4db243 100644 (file)
--- a/src/Compressor.hpp
+++ b/src/Compressor.hpp
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "system.hpp"
+
 #include "Compression.hpp"
 
 #include <memory>

diff --git a/src/File.hpp b/src/File.hpp
index e76be8f214c380372ac3ac3abcc61a344991c36a..0cac829c441e8226582cc6d1516c9e89a6cbc1c3 100644 (file)
--- a/src/File.hpp
+++ b/src/File.hpp
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "system.hpp"
+
 #include "NonCopyable.hpp"
 
 #include <cstdio>

diff --git a/src/FormatNonstdStringView.hpp b/src/FormatNonstdStringView.hpp
index c2f93ad9a126423952492b5879dd62c558c9b109..ded6de1d5fa04d9b7bc97c47f6de6baa3de77c06 100644 (file)
--- a/src/FormatNonstdStringView.hpp
+++ b/src/FormatNonstdStringView.hpp
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "system.hpp"
+
 #include "third_party/fmt/core.h"
 #include "third_party/nonstd/string_view.hpp"
 

diff --git a/src/NullCompressor.hpp b/src/NullCompressor.hpp
index 1dfdf55c5a19d0b8024e2655ea3064f8b18e9fcd..9a4fcd16db9e9912991459344236ddc14897d6d6 100644 (file)
--- a/src/NullCompressor.hpp
+++ b/src/NullCompressor.hpp
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "system.hpp"
+
 #include "Compressor.hpp"
 #include "NonCopyable.hpp"
 

diff --git a/src/NullDecompressor.hpp b/src/NullDecompressor.hpp
index cef5b4458dead48cac569da28bc8725d6680cf58..514ed7d7cf573389432ff00ae86f21baa563ccc9 100644 (file)
--- a/src/NullDecompressor.hpp
+++ b/src/NullDecompressor.hpp
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "system.hpp"
+
 #include "Decompressor.hpp"
 #include "NonCopyable.hpp"
 

diff --git a/src/ProgressBar.cpp b/src/ProgressBar.cpp
index 55db6a6bb9326e0c89dd6293de64581c279da4bf..a155fa9b0a5bebae425c70be4f44cea6c96f37cd 100644 (file)
--- a/src/ProgressBar.cpp
+++ b/src/ProgressBar.cpp
@@ -23,9 +23,7 @@
 #include <cstdio>
 #include <unistd.h>
 
-#ifdef _WIN32
-#  include <windows.h>
-#else
+#ifndef _WIN32
 #  include <sys/ioctl.h>
 #endif
 

diff --git a/src/ProgressBar.hpp b/src/ProgressBar.hpp
index c23696c590066495775e02bd3cf21e16aea27c37..8aefa897d4e6170d6419c8ca92dbdf16f918531d 100644 (file)
--- a/src/ProgressBar.hpp
+++ b/src/ProgressBar.hpp
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "system.hpp"
+
 #include <string>
 
 class ProgressBar

diff --git a/src/cleanup.hpp b/src/cleanup.hpp
index ac81e8fc912f6396cf4b2bddb956d161c713de3d..4951fef32613204bdab8866c4ab6702290c9ea09 100644 (file)
--- a/src/cleanup.hpp
+++ b/src/cleanup.hpp
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "system.hpp"
+
 #include "Util.hpp"
 
 #include <string>

diff --git a/src/compress.hpp b/src/compress.hpp
index 96bbed0204ef9ba7ab1cef341bcfa8fae1f3c3f0..72423be1c5e79fffccb3a23844055cb47ac74a0c 100644 (file)
--- a/src/compress.hpp
+++ b/src/compress.hpp
@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "system.hpp"
+
 #include "Config.hpp"
 #include "Util.hpp"
 

diff --git a/src/legacy_util.cpp b/src/legacy_util.cpp
index b818d5b418429c95f94e393fd938025c5b3bc0dc..b752355c6edc5f60ab271dc09d4753ca6484ada4 100644 (file)
--- a/src/legacy_util.cpp
+++ b/src/legacy_util.cpp
@@ -60,7 +60,6 @@
 #  include <psapi.h>
 #  include <sys/locking.h>
 #  include <tchar.h>
-#  include <windows.h>
 #endif
 
 // Destination for g_config.log_file.

diff --git a/src/system.hpp b/src/system.hpp
index 3fff3e186f36c6ec90ae3cbae2c8ac78e8e77242..4307a7e9c0da21facf3c4194fa261636a48baca2 100644 (file)
--- a/src/system.hpp
+++ b/src/system.hpp
@@ -71,7 +71,8 @@ extern char** environ;
 
 #ifdef _WIN32
 #  ifndef _WIN32_WINNT
-#    define _WIN32_WINNT 0x0501
+// _WIN32_WINNT is set in the generated header config.h
+#    error _WIN32_WINNT is undefined
 #  endif
 #  include <windows.h>
 #  define mkdir(a, b) mkdir(a)