Moved Windows defines before objbase.h includes, since it can include windows.h.

Wrapped defines in order to avoid redefinition warnings/errors under strict compilation settings.
This commit is contained in:
Cameron Angus 2019-12-07 18:10:51 +00:00
parent 4179dacce4
commit 6bd1e3bb78

View File

@ -18,10 +18,13 @@
#include <gsl/span>
#ifdef _WIN32
#include <objbase.h>
#define WIN32_LEAN_AND_MEAN
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#ifndef NOMINMAX
#define NOMINMAX
#endif
#include <objbase.h>
#include <windows.h>
#include <intrin.h>
#include <iphlpapi.h>