Include windows.h before other Win32 header files

This commit is contained in:
Rangi42
2025-01-27 19:17:27 -05:00
committed by Rangi
parent 192fc808c8
commit 01c9106b59
2 changed files with 10 additions and 8 deletions

View File

@@ -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
#include <fileapi.h> // CreateFileA
#include <winbase.h> // CreateFileMappingA
#include <memoryapi.h> // MapViewOfFile
#include <handleapi.h> // CloseHandle
// clang-format on
#include <fileapi.h> // CreateFileA
#include <handleapi.h> // CloseHandle
#include <memoryapi.h> // MapViewOfFile
#include <winbase.h> // CreateFileMappingA
static char *mapFile(int fd, std::string const &path, size_t) {
void *mappingAddr = nullptr;

View File

@@ -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>
#undef max // This macro conflicts with `std::numeric_limits<...>::max()`
#endif