projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 66decc7) | patch
glsl/glcpp: rename ERROR to ERROR_TOKEN to fix MSVC build
authorBrian Paul <brianp@vmware.com>
Tue, 29 Jul 2014 22:56:06 +0000 (16:56 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 30 Jul 2014 14:12:03 +0000 (08:12 -0600)
commit85109bc5072391d3ef988f3ebaea66b6579b2b16
treec1a29d7990c021e26987b4325736ba3f63c321b0tree
parent66decc7efa08ae9c94e4bd11038cfe8b3132d554commit | diff
glsl/glcpp: rename ERROR to ERROR_TOKEN to fix MSVC build

ERROR is a #define in the MSVC WinGDI.h header file.
Add the _TOKEN suffix as we do for a few other lexer tokens.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/glsl/glcpp/glcpp-lex.l diff | blob | history
src/glsl/glcpp/glcpp-parse.y diff | blob | history