diff options
| author | Brian Paul <[email protected]> | 2014-07-29 16:56:06 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2014-07-30 08:12:03 -0600 |
| commit | 85109bc5072391d3ef988f3ebaea66b6579b2b16 (patch) | |
| tree | c1a29d7990c021e26987b4325736ba3f63c321b0 /src/glsl/glcpp/glcpp-lex.l | |
| parent | 66decc7efa08ae9c94e4bd11038cfe8b3132d554 (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 <[email protected]>
Diffstat (limited to 'src/glsl/glcpp/glcpp-lex.l')
| -rw-r--r-- | src/glsl/glcpp/glcpp-lex.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index 4b9ab23d07a..c126850d0c2 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/glsl/glcpp/glcpp-lex.l @@ -350,7 +350,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]? <HASH>error.* { BEGIN INITIAL; - RETURN_STRING_TOKEN (ERROR); + RETURN_STRING_TOKEN (ERROR_TOKEN); } /* After we see a "#define" we enter the <DEFINE> start state |