diff options
| author | Carl Worth <cworth@cworth.org> | 2010-08-23 11:38:45 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2011-01-28 15:16:36 +1000 |
| commit | d3df641f0aba99b0b65ecd4d9b06798bca090a29 (patch) | |
| tree | d86a67214443202a65f0b986162b68c7a2cb09ff /src/glsl/glcpp/tests | |
| parent | 476db2bd3d72440f54ff57c23da05dc1d624fee9 (diff) | |
glcpp: Demote "macro redefined" from an error to a warning
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.
Diffstat (limited to 'src/glsl/glcpp/tests')
| -rw-r--r-- | src/glsl/glcpp/tests/089-redefine-macro-error.c.expected | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected b/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected index 6209ead559..4c92e1dd4a 100644 --- a/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected +++ b/src/glsl/glcpp/tests/089-redefine-macro-error.c.expected @@ -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 |