From: Jan Zielinski <jan.zielinski@intel.com>
Date: Thu, 12 Dec 2019 13:07:20 +0000 (+0100)
Subject: gallium/swr: Fix Windows build
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bd5077ae1dfaa1f5652a7a1febfcc0f27b030823;p=mesa.git

gallium/swr: Fix Windows build

Tessellator defines own fmin/fmax functions that conflict
with those defined in cmath header. Need to use legacy math.h
which was originally used in MS code.

Reviewed-by: Krzysztof Raszkowski <krzysztof.raszkowski@intel.com>
---

diff --git a/src/gallium/drivers/swr/rasterizer/core/tessellator.cpp b/src/gallium/drivers/swr/rasterizer/core/tessellator.cpp
index 6e12b691037..e0464c360fa 100644
--- a/src/gallium/drivers/swr/rasterizer/core/tessellator.cpp
+++ b/src/gallium/drivers/swr/rasterizer/core/tessellator.cpp
@@ -18,8 +18,11 @@
 */
 
 #include "tessellator.hpp"
-// #include <math.h> // ceil
+#if defined(_WIN32) || defined(_WIN64)
+#include <math.h> // ceil
+#else
 #include <cmath>
+#endif
 //#include <windows.h> // Just used for some commented out debug stat printing.
 //#include <strsafe.h> // Ditto.
 #define min(x,y) (x < y ? x : y)