diff --git a/include/uuid.h b/include/uuid.h index 3294b2b..a99a43f 100644 --- a/include/uuid.h +++ b/include/uuid.h @@ -18,10 +18,13 @@ #include #ifdef _WIN32 -#include - -#define WIN32_LEAN_AND_MEAN +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif +#ifndef NOMINMAX #define NOMINMAX +#endif +#include #include #include #include @@ -697,7 +700,7 @@ namespace uuids bytes.byte15 } }; return uuid{ std::begin(arrbytes), std::end(arrbytes) }; -#elif +#else return uuid{}; #endif }