AuroraMiddleware/stduuid
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

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

Browse Source 
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
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/uuid.h
View File

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