Mesa (master): glsl: fix redefinition warning on win32

[GitLab Mirror]

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

Author: Michel Zou <xantares09 at hotmail.com>
Date:   Tue Nov 24 16:06:07 2020 +0100

glsl: fix redefinition warning on win32

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7713>

---

 src/compiler/glsl/glsl_lexer.ll  | 2 +-
 src/compiler/glsl/glsl_parser.yy | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll
index 7d7ee0c00ff..3e558b3b060 100644
--- a/src/compiler/glsl/glsl_lexer.ll
+++ b/src/compiler/glsl/glsl_lexer.ll
@@ -661,7 +661,7 @@ public		KEYWORD(110, 100, 0, 0, PUBLIC_TOK);
 static		KEYWORD(110, 100, 0, 0, STATIC);
 extern		KEYWORD(110, 100, 0, 0, EXTERN);
 external	KEYWORD(110, 100, 0, 0, EXTERNAL);
-interface	KEYWORD(110, 100, 0, 0, INTERFACE);
+interface	KEYWORD(110, 100, 0, 0, INTERFACE_TOK);
 long		KEYWORD(110, 100, 0, 0, LONG_TOK);
 short		KEYWORD(110, 100, 0, 0, SHORT_TOK);
 double		TYPE_WITH_ALT(130, 100, 130, 300, yyextra->ARB_gpu_shader_fp64_enable, glsl_type::double_type);
diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy
index e6ed70176c3..78bd3610990 100644
--- a/src/compiler/glsl/glsl_parser.yy
+++ b/src/compiler/glsl/glsl_parser.yy
@@ -164,7 +164,7 @@ static bool match_layout_qualifier(const char *s1, const char *s2,
 %token INVARIANT PRECISE
 %token LOWP MEDIUMP HIGHP SUPERP PRECISION
 
-%token VERSION_TOK EXTENSION LINE COLON EOL INTERFACE OUTPUT
+%token VERSION_TOK EXTENSION LINE COLON EOL INTERFACE_TOK OUTPUT
 %token PRAGMA_DEBUG_ON PRAGMA_DEBUG_OFF
 %token PRAGMA_OPTIMIZE_ON PRAGMA_OPTIMIZE_OFF
 %token PRAGMA_WARNING_ON PRAGMA_WARNING_OFF