mirror of https://github.com/davisking/dlib.git
Added a #define for _NO_W32_PSEUDO_MODIFIERS so that windows.h won't #define IN or OUT
This commit is contained in:
parent
2821926236
commit
d635c1d78a
|
@ -14,6 +14,11 @@
|
||||||
#define NOMINMAX // prevent windows from messing with std::min and std::max
|
#define NOMINMAX // prevent windows from messing with std::min and std::max
|
||||||
#endif
|
#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
|
// now just for good measure undefine min and max if they are defined
|
||||||
#ifdef min
|
#ifdef min
|
||||||
#undef min
|
#undef min
|
||||||
|
|
Loading…
Reference in New Issue