From 2a18d1950c84c96d263cc8f15434502e03aeb1dc Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Sat, 29 Jan 2011 08:19:39 +1000 Subject: Revert "glcpp: Demote "macro redefined" from an error to a warning" This reverts commit d3df641f0aba99b0b65ecd4d9b06798bca090a29. The original commit had sat unpushed on my machine for months. By the time I found it again, I had forgotten that we had decided not to use this change after all, (the relevant test was removed long ago). --- 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 4c92e1dd4a..6209ead559 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 warning: Redefinition of macro x +0:2(9): preprocessor error: Redefinition of macro x -0:5(9): preprocessor warning: Redefinition of macro abc +0:5(9): preprocessor error: Redefinition of macro abc -0:8(9): preprocessor warning: Redefinition of macro foo +0:8(9): preprocessor error: Redefinition of macro foo -0:11(9): preprocessor warning: Redefinition of macro bar +0:11(9): preprocessor error: Redefinition of macro bar -0:14(9): preprocessor warning: Redefinition of macro biff +0:14(9): preprocessor error: Redefinition of macro biff -0:17(9): preprocessor warning: Redefinition of macro oper +0:17(9): preprocessor error: Redefinition of macro oper -- cgit v1.2.3