Module: Mesa
Branch: master
Commit: 1098c18af3f432968be9c46a2be0ff7f420060d7
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1098c18af3f432968be9c46a2be0ff7f420060d7

Author: Brian Paul <bri...@vmware.com>
Date:   Fri Apr 13 09:56:33 2018 -0600

glsl: #undef THIS macro to fix MSVC build

THIS is a macro in one of the MSVC header files.  It's also a token
in the GLSL lexer.  This causes a compilation failure with MSVC.
This issue seems to be newly exposed after the recent mtypes.h removal
patches.

Reviewed-by: Charmaine Lee <charmai...@vmware.com>
Reviewed-by: Neha Bhende <bhen...@vmware.com>

---

 src/compiler/glsl/glsl_parser_extras.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/compiler/glsl/glsl_parser_extras.h 
b/src/compiler/glsl/glsl_parser_extras.h
index 66bd1a3db6..5b9b6cc862 100644
--- a/src/compiler/glsl/glsl_parser_extras.h
+++ b/src/compiler/glsl/glsl_parser_extras.h
@@ -33,6 +33,11 @@
 #include <stdlib.h>
 #include "glsl_symbol_table.h"
 
+/* THIS is a macro defined somewhere deep in the Windows MSVC header files.
+ * Undefine it here to avoid collision with the lexer's THIS token.
+ */
+#undef THIS
+
 struct gl_context;
 
 struct glsl_switch_state {

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to