diff options
| author | Carl Worth <cworth@cworth.org> | 2011-01-29 08:19:39 +1000 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2011-01-29 08:21:05 +1000 |
| commit | 2a18d1950c84c96d263cc8f15434502e03aeb1dc (patch) | |
| tree | bd9cf19acb8d21ad2d77a1b54060c3b100ff45b7 /src/glsl/glcpp/README | |
| 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/README')
| -rw-r--r-- | src/glsl/glcpp/README | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/glsl/glcpp/README b/src/glsl/glcpp/README index 9cc00e9275..0b5ef508ce 100644 --- a/src/glsl/glcpp/README +++ b/src/glsl/glcpp/README @@ -29,27 +29,4 @@ The __LINE__ and __FILE__ macros are not yet supported. A file that ends with a function-like macro name as the last non-whitespace token will result in a parse error, (where it should be -passed through as is). - -Known deviations from the specification ---------------------------------------- -As mentoned above, the GLSL specification (as of 1.30.10) is fairly -vague on some aspects of the preprocessor, and we've been using C99 to -fill in details. Here is a list of cases where we have deviated from -the behavior specified in C99 to obtain better compatibility with -other GLSL implementations: - - * Redefining a macro with a different value - - C89 says that a macro "may be redefined ... provided that the - second definition [is equivalent]" (Section 3.8.3 Macro - Replacement/constraints) - - C99 is even more explicit, saying tthat a macro "shall not be - redefined by another #define preprocessing directive unless the - second definition [is equivalent]" (Section 6.10.3 Macro - Replacement/Constraints) - - In spite of this, glcpp emits a warning rather than an error for - non-equivalent redefinition of macros since this matches the - behavior of other, widely-used implementations. +passed through as is).
\ No newline at end of file |