projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4025583)
gallium/swr: Fix building swr with MSVC
authorKrzysztof Raszkowski <krzysztof.raszkowski@intel.com>
Fri, 22 May 2020 15:29:01 +0000 (17:29 +0200)
committerKrzysztof Raszkowski <krzysztof.raszkowski@intel.com>
Fri, 22 May 2020 15:34:26 +0000 (17:34 +0200)
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>

src/gallium/drivers/swr/rasterizer/common/os.h patch | blob | history

diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
index a52bc0e0db60b7d61db72218766798659fe4c9dc..bda114d64e2faeef2b095085cf5d59c80382cf79 100644 (file)
--- 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