diff options
| author | Ian Romanick <[email protected]> | 2010-06-30 16:40:47 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2010-07-01 20:40:08 -0700 |
| commit | efb6b24223e0bfd29959e131cd308b1e07ff20df (patch) | |
| tree | 1b520683f81249c6d3575fd35e654b52926131fd /src/glsl/glsl_lexer.lpp | |
| parent | 06143ea09411aa283ac3633bfbfa4326584cd952 (diff) | |
glsl2: Append _TOK to some parser tokens
This prevents conflicts with defines elsewhere in Mesa and allows
including mtypes.h in the compiler.
Diffstat (limited to 'src/glsl/glsl_lexer.lpp')
| -rw-r--r-- | src/glsl/glsl_lexer.lpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/glsl_lexer.lpp b/src/glsl/glsl_lexer.lpp index f236a156820..ddaa19db722 100644 --- a/src/glsl/glsl_lexer.lpp +++ b/src/glsl/glsl_lexer.lpp @@ -105,7 +105,7 @@ HASH ^{SPC}#{SPC} \n { yylineno++; yycolumn = 0; } attribute return ATTRIBUTE; -const return CONST; +const return CONST_TOK; bool return BOOL; float return FLOAT; int return INT; @@ -272,10 +272,10 @@ packed return PACKED; goto return GOTO; switch return SWITCH; default return DEFAULT; -inline return INLINE; +inline return INLINE_TOK; noinline return NOINLINE; volatile return VOLATILE; -public return PUBLIC; +public return PUBLIC_TOK; static return STATIC; extern return EXTERN; external return EXTERNAL; |