From: Krzysztof Raszkowski <krzysztof.raszkowski@intel.com>
Date: Fri, 22 May 2020 15:29:01 +0000 (+0200)
Subject: gallium/swr: Fix building swr with MSVC
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=09fc9c5f6ca02e5eebc5a11771c2cc1a9df5fc7e;p=mesa.git

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@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5166>
---

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