From 1098c18af3f432968be9c46a2be0ff7f420060d7 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 13 Apr 2018 09:56:33 -0600 Subject: [PATCH] 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 Reviewed-by: Neha Bhende --- 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 66bd1a3db6e..5b9b6cc8621 100644 --- a/src/compiler/glsl/glsl_parser_extras.h +++ b/src/compiler/glsl/glsl_parser_extras.h @@ -33,6 +33,11 @@ #include #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 { -- 2.30.2