Add #include wrapper to fix min/max <Windows.h> mess
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
parent
856be3a0d8
commit
16a86cf350
@ -8,7 +8,7 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include "windows.h"
|
||||||
#include <sal.h>
|
#include <sal.h>
|
||||||
#endif
|
#endif
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
#include "compat.hpp"
|
#include "compat.hpp"
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include "windows.h"
|
||||||
#include <intrin.h>
|
#include <intrin.h>
|
||||||
#include <intsafe.h>
|
#include <intsafe.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
#include <windows.h>
|
#include "windows.h"
|
||||||
#include <asptlb.h>
|
#include <asptlb.h>
|
||||||
#include <objidl.h>
|
#include <objidl.h>
|
||||||
#include <WinSock2.h>
|
#include <WinSock2.h>
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
#include <windows.h>
|
#include "windows.h"
|
||||||
#include <rpc.h>
|
#include <rpc.h>
|
||||||
#elif defined(__APPLE__)
|
#elif defined(__APPLE__)
|
||||||
#include <uuid/uuid.h>
|
#include <uuid/uuid.h>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
#include "compat.hpp"
|
#include "compat.hpp"
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include "windows.h"
|
||||||
#include <oaidl.h>
|
#include <oaidl.h>
|
||||||
#include <tchar.h>
|
#include <tchar.h>
|
||||||
#else
|
#else
|
||||||
|
24
include/stdex/windows.h
Normal file
24
include/stdex/windows.h
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
/*
|
||||||
|
SPDX-License-Identifier: MIT
|
||||||
|
Copyright © 2023 Amebis
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
// Windows.h #defines min and max, which collides with std::min and std::max.
|
||||||
|
// Not only the collision problem, #defining min and max is plain wrong as it
|
||||||
|
// causes multiple evaluations of parameter expressions.
|
||||||
|
|
||||||
|
#ifndef NOMINMAX
|
||||||
|
#define NOMINMAX
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <windows.h>
|
||||||
|
|
||||||
|
// In case somebody #included <windows.h> before us without #defining NOMINMAX
|
||||||
|
#ifdef min
|
||||||
|
#undef min
|
||||||
|
#endif
|
||||||
|
#ifdef max
|
||||||
|
#undef max
|
||||||
|
#endif
|
Loading…
x
Reference in New Issue
Block a user