Mesa (master): gallium/swr: Fix building swr with MSVC

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 09fc9c5f6ca02e5eebc5a11771c2cc1a9df5fc7e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=09fc9c5f6ca02e5eebc5a11771c2cc1a9df5fc7e

Author: Krzysztof Raszkowski <krzysztof.raszkowski at intel.com>
Date:   Fri May 22 17:29:01 2020 +0200

gallium/swr: Fix building swr with MSVC

Fix building swr with MSVC by turning off
UNICODE before including windows.h.

Reviewed-by: Jan Zielinski <jan.zielinski at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5166>

---

 src/gallium/drivers/swr/rasterizer/common/os.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
index a52bc0e0db6..bda114d64e2 100644
--- a/src/gallium/drivers/swr/rasterizer/common/os.h
+++ b/src/gallium/drivers/swr/rasterizer/common/os.h
@@ -33,9 +33,11 @@
 #define SWR_VISIBLE __declspec(dllexport)
 
 #ifndef NOMINMAX
+#undef UNICODE
 #define NOMINMAX
 #include <windows.h>
 #undef NOMINMAX
+#define UNICODE
 #else
 #include <windows.h>
 #endif