AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glcpp: Demote "macro redefined" from an error to a warning

Browse Source 
The GLSL specification is vague here, (just says "as is standard for
C++"), though the C specifications seem quite clear that this should
be an error.

However, an existing piglit test (CorrectPreprocess11.frag) expects
this to be a warning, not an error, so we change this, and document in
README the deviation from the specification.
This commit is contained in:
Carl Worth
2010-08-23 11:38:45 -07:00
parent 476db2bd3d
commit d3df641f0a
4 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glsl/glcpp/tests/089-redefine-macro-error.c.expected
+6 -6
View File
@@ -1,14 +1,14 @@
0:2(9): preprocessor error: Redefinition of macro x
0:2(9): preprocessor warning: Redefinition of macro x
0:5(9): preprocessor error: Redefinition of macro abc
0:5(9): preprocessor warning: Redefinition of macro abc
0:8(9): preprocessor error: Redefinition of macro foo
0:8(9): preprocessor warning: Redefinition of macro foo
0:11(9): preprocessor error: Redefinition of macro bar
0:11(9): preprocessor warning: Redefinition of macro bar
0:14(9): preprocessor error: Redefinition of macro biff
0:14(9): preprocessor warning: Redefinition of macro biff
0:17(9): preprocessor error: Redefinition of macro oper
0:17(9): preprocessor warning: Redefinition of macro oper