diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2016-02-17 17:15:23 -0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2016-02-18 13:38:50 -0800 |
| commit | 1c694a6c20da21f31c584fd41d28e2f03522617d (patch) | |
| tree | ee308423d64785490d732f09e5aa2e32d5181672 /src/compiler/glsl/glcpp | |
| parent | dfc95ad6d129436a3d2383152583919fb2dde261 (diff) | |
| download | external_mesa3d-1c694a6c20da21f31c584fd41d28e2f03522617d.zip external_mesa3d-1c694a6c20da21f31c584fd41d28e2f03522617d.tar.gz external_mesa3d-1c694a6c20da21f31c584fd41d28e2f03522617d.tar.bz2 | |
glcpp: Disallow "defined" as a macro name.
Both GCC and Clang disallow this, and glslang has recently started
disallowing it as well.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94188
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/compiler/glsl/glcpp')
| -rw-r--r-- | src/compiler/glsl/glcpp/glcpp-parse.y | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index 43a1aa9..70951a0 100644 --- a/src/compiler/glsl/glcpp/glcpp-parse.y +++ b/src/compiler/glsl/glcpp/glcpp-parse.y @@ -2096,6 +2096,9 @@ _check_for_reserved_macro_name (glcpp_parser_t *parser, YYLTYPE *loc, if (strncmp(identifier, "GL_", 3) == 0) { glcpp_error (loc, parser, "Macro names starting with \"GL_\" are reserved.\n"); } + if (strcmp(identifier, "defined") == 0) { + glcpp_error (loc, parser, "\"defined\" cannot be used as a macro name"); + } } static int |