Include windows.h before other Win32 header files

Rangi42 · Jan 28, 2025 · cd975c7 · cd975c7
1 parent b1eb3b1
commit cd975c7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/asm/lexer.cpp b/src/asm/lexer.cpp
@@ -35,15 +35,14 @@
 
 // Neither MSVC nor MinGW provide `mmap`
 #if defined(_MSC_VER) || defined(__MINGW32__)
-// clang-format off
-	// (we need these `include`s in this order)
-	#define WIN32_LEAN_AND_MEAN // include less from windows.h
+// clang-format off: maintain `include` order
+	#define WIN32_LEAN_AND_MEAN // Include less from `windows.h`
 	#include <windows.h>   // target architecture
+// clang-format on
 	#include <fileapi.h>   // CreateFileA
-	#include <winbase.h>   // CreateFileMappingA
-	#include <memoryapi.h> // MapViewOfFile
 	#include <handleapi.h> // CloseHandle
-// clang-format on
+	#include <memoryapi.h> // MapViewOfFile
+	#include <winbase.h>   // CreateFileMappingA
 
 static char *mapFile(int fd, std::string const &path, size_t) {
 	void *mappingAddr = nullptr;

diff --git a/test/gfx/rgbgfx_test.cpp b/test/gfx/rgbgfx_test.cpp
@@ -27,10 +27,13 @@
 	#include <spawn.h>
 	#include <unistd.h>
 #else
-	#define WIN32_LEAN_AND_MEAN // Include less from `windows.h` to avoid conflicts
+// clang-format off: maintain `include` order
+	#define WIN32_LEAN_AND_MEAN // Include less from `windows.h`
+	#include <windows.h>
+// clang-format on
 	#include <errhandlingapi.h>
 	#include <processthreadsapi.h>
-	#include <windows.h>
+
 	#undef max // This macro conflicts with `std::numeric_limits<...>::max()`
 #endif