diff options
| author | Carl Worth <[email protected]> | 2011-01-29 08:19:39 +1000 |
|---|---|---|
| committer | Carl Worth <[email protected]> | 2011-01-29 08:21:05 +1000 |
| commit | 2a18d1950c84c96d263cc8f15434502e03aeb1dc (patch) | |
| tree | bd9cf19acb8d21ad2d77a1b54060c3b100ff45b7 /src/glsl/glcpp/tests | |
| parent | 3451ee056c8703f0d09bfab33d5fa224d4649bc4 (diff) | |
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).
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 4c92e1dd4a6..6209ead559e 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 |