From d3df641f0aba99b0b65ecd4d9b06798bca090a29 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Mon, 23 Aug 2010 11:38:45 -0700 Subject: 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. --- src/glsl/glcpp/tests/089-redefine-macro-error.c.expected | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/glsl/glcpp/tests') 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 -- cgit v1.2.3