From d635c1d78a8317e734616b43854830c726db4460 Mon Sep 17 00:00:00 2001 From: Davis King Date: Tue, 22 Apr 2014 20:52:26 -0400 Subject: [PATCH] Added a #define for _NO_W32_PSEUDO_MODIFIERS so that windows.h won't #define IN or OUT --- dlib/windows_magic.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlib/windows_magic.h b/dlib/windows_magic.h index 348bf96ee..cfb7f22ed 100644 --- a/dlib/windows_magic.h +++ b/dlib/windows_magic.h @@ -14,6 +14,11 @@ #define NOMINMAX // prevent windows from messing with std::min and std::max #endif +// Prevent windows from #defining IN or OUT +#ifndef _NO_W32_PSEUDO_MODIFIERS +#define _NO_W32_PSEUDO_MODIFIERS +#endif + // now just for good measure undefine min and max if they are defined #ifdef min #undef min