[Mesa-dev] [PATCH 11/14] swr: [rasterizer common] don't bleed NOMINMAX definition after <windows.h>

[Tim Rowley]

---
 src/gallium/drivers/swr/rasterizer/common/os.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
index ac52b60..28e7ff5 100644
--- a/src/gallium/drivers/swr/rasterizer/common/os.h
+++ b/src/gallium/drivers/swr/rasterizer/common/os.h
@@ -33,8 +33,11 @@
 
 #ifndef NOMINMAX
 #define NOMINMAX
-#endif
 #include <windows.h>
+#undef NOMINMAX
+#else
+#include <windows.h>
+#endif
 #include <intrin.h>
 #include <cstdint>
 
-- 
2.7.4