From: Gert Wollny <gw.fossdev@gmail.com>
Date: Wed, 6 Sep 2017 12:21:25 +0000 (+0200)
Subject: mesa/st/st_glsl_to_tgsi_temprename.cpp: Fix compilation with MSVC
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=107ecd97f1b978599daf689db68a40c5f9dcd025;p=mesa.git

mesa/st/st_glsl_to_tgsi_temprename.cpp: Fix compilation with MSVC

If <windows.h> is included then max is a macro that clashes
with std::numeric_limits::max, hence undefine it.
For some reason the struct access_record is not recognizes
outside the anonymouse namespace, make it a class.
The patch successfully was tested on AppVeyor.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp
index d984184e701..00ec7e749bd 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi_temprename.cpp
@@ -43,6 +43,13 @@ using std::cerr;
 using std::setw;
 #endif
 
+/* If <windows.h> is included this is defined and clashes with
+ * std::numeric_limits<>::max()
+ */
+#ifdef max
+#undef max
+#endif
+
 using std::numeric_limits;
 
 /* Without c++11 define the nullptr for forward-compatibility
@@ -592,7 +599,8 @@ lifetime temp_comp_access::get_required_lifetime()
 
 /* Helper class for sorting and searching the registers based
  * on life times. */
-struct access_record {
+class access_record {
+public:
    int begin;
    int end;
    int reg;