From 09fc9c5f6ca02e5eebc5a11771c2cc1a9df5fc7e Mon Sep 17 00:00:00 2001 From: Krzysztof Raszkowski Date: Fri, 22 May 2020 17:29:01 +0200 Subject: [PATCH] gallium/swr: Fix building swr with MSVC Fix building swr with MSVC by turning off UNICODE before including windows.h. Reviewed-by: Jan Zielinski Part-of: --- 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 #undef NOMINMAX +#define UNICODE #else #include #endif -- 2.30.2