From: Tim Rowley <timothy.o.rowley@intel.com>
Date: Mon, 7 Nov 2016 22:11:45 +0000 (-0600)
Subject: swr: [rasterizer common] don't bleed NOMINMAX definition after <windows.h>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e9a3ad164db220d4517a3bb684ce6d01d01f0087;p=mesa.git

swr: [rasterizer common] don't bleed NOMINMAX definition after <windows.h>

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
---

diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
index ac52b605cc2..28e7ff54f96 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>