Re: [Mesa-dev] [PATCH] glsl/glcpp: rename ERROR to ERROR_TOKEN to fix MSVC build

2014-07-30 Thread Kenneth Graunke
On Wednesday, July 30, 2014 11:31:19 AM Jose Fonseca wrote: > On 30/07/14 03:42, Kenneth Graunke wrote: > > On Tuesday, July 29, 2014 05:02:39 PM Brian Paul wrote: > >> ERROR is a #define in the MSVC WinGDI.h header file. > >> Add the _TOKEN suffix as we do for a few other lexer tokens. > > Brian,

Re: [Mesa-dev] [PATCH] glsl/glcpp: rename ERROR to ERROR_TOKEN to fix MSVC build

2014-07-30 Thread Jose Fonseca
On 30/07/14 03:42, Kenneth Graunke wrote: On Tuesday, July 29, 2014 05:02:39 PM Brian Paul wrote: ERROR is a #define in the MSVC WinGDI.h header file. Add the _TOKEN suffix as we do for a few other lexer tokens. Brian, sorry I missed your review and ended up duplicating it byte per byte! Ob

Re: [Mesa-dev] [PATCH] glsl/glcpp: rename ERROR to ERROR_TOKEN to fix MSVC build

2014-07-29 Thread Kenneth Graunke
On Tuesday, July 29, 2014 05:02:39 PM Brian Paul wrote: > ERROR is a #define in the MSVC WinGDI.h header file. > Add the _TOKEN suffix as we do for a few other lexer tokens. How about ERROR_TOK? That's what we use in the main compiler. Either way, Reviewed-by: Kenneth Graunke > --- > src/glsl

[Mesa-dev] [PATCH] glsl/glcpp: rename ERROR to ERROR_TOKEN to fix MSVC build

2014-07-29 Thread Brian Paul
ERROR is a #define in the MSVC WinGDI.h header file. Add the _TOKEN suffix as we do for a few other lexer tokens. --- src/glsl/glcpp/glcpp-lex.l |2 +- src/glsl/glcpp/glcpp-parse.y |6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/