diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-28 08:01:47 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-28 08:01:47 +0000 |
| commit | dc0f390b45a3037c85163b8a9e945a31f5756690 (patch) | |
| tree | 317b992cf88d5a7df8c9b9c7c419aef42246fa3f /mesalib/src/glsl/glcpp/glcpp-parse.y | |
| parent | 987904f9692c374b81547ebe0bd3bad5a279db48 (diff) | |
| download | vcxsrv-dc0f390b45a3037c85163b8a9e945a31f5756690.tar.gz vcxsrv-dc0f390b45a3037c85163b8a9e945a31f5756690.tar.bz2 vcxsrv-dc0f390b45a3037c85163b8a9e945a31f5756690.zip | |
libfontenc libXau libxcb mesalib git update 28 jan 2011
Diffstat (limited to 'mesalib/src/glsl/glcpp/glcpp-parse.y')
| -rw-r--r-- | mesalib/src/glsl/glcpp/glcpp-parse.y | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.y b/mesalib/src/glsl/glcpp/glcpp-parse.y index b449eb288..797e61428 100644 --- a/mesalib/src/glsl/glcpp/glcpp-parse.y +++ b/mesalib/src/glsl/glcpp/glcpp-parse.y @@ -1687,8 +1687,8 @@ _define_object_macro (glcpp_parser_t *parser, talloc_free (macro); return; } - glcpp_error (loc, parser, "Redefinition of macro %s\n", - identifier); + glcpp_warning (loc, parser, "Redefinition of macro %s\n", + identifier); } hash_table_insert (parser->defines, macro, identifier); @@ -1718,8 +1718,8 @@ _define_function_macro (glcpp_parser_t *parser, talloc_free (macro); return; } - glcpp_error (loc, parser, "Redefinition of macro %s\n", - identifier); + glcpp_warning (loc, parser, "Redefinition of macro %s\n", + identifier); } hash_table_insert (parser->defines, macro, identifier); |