diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-04 09:06:40 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-04 09:17:59 -0600 |
| commit | 3fedd08779c2bc4a5f02c035e7ca4cab5da649dd (patch) | |
| tree | b559cd2b06d37e18b869ffafb451867e8e7cd72a /src/mesa/shader/program_parse.tab.h | |
| parent | 40636fe6f2763e6be4141516a9eba5004b371915 (diff) | |
ARB prog: rename POINT, SIZE to POINT_TOK, SIZE_TOK
Fixes symbol collisions with typedefs in Microsoft headers.
Perhaps we should prefix/suffix all the lexer tokens to avoid this.
Diffstat (limited to 'src/mesa/shader/program_parse.tab.h')
| -rw-r--r-- | src/mesa/shader/program_parse.tab.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/program_parse.tab.h b/src/mesa/shader/program_parse.tab.h index de08fb747f..b0f757ffa0 100644 --- a/src/mesa/shader/program_parse.tab.h +++ b/src/mesa/shader/program_parse.tab.h @@ -93,7 +93,7 @@ PALETTE = 309, PARAMS = 310, PLANE = 311, - POINT = 312, + POINT_TOK = 312, POINTSIZE = 313, POSITION = 314, PRIMARY = 315, @@ -105,7 +105,7 @@ SCENECOLOR = 321, SECONDARY = 322, SHININESS = 323, - SIZE = 324, + SIZE_TOK = 324, SPECULAR = 325, SPOT = 326, STATE = 327, |