aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/glcpp/glcpp-parse.y
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-28 08:34:35 +0000
committermarha <marha@users.sourceforge.net>2011-01-28 08:34:35 +0000
commit39339fcb860cb48b4f988f5eed31f8d7d2fc1464 (patch)
tree84ecdb55b6759e58969e7e8e3e36a6d361e1c90a /mesalib/src/glsl/glcpp/glcpp-parse.y
parent613fdaf384eb16a4d7058dcbfbca9f43e44e063d (diff)
parentdc0f390b45a3037c85163b8a9e945a31f5756690 (diff)
downloadvcxsrv-39339fcb860cb48b4f988f5eed31f8d7d2fc1464.tar.gz
vcxsrv-39339fcb860cb48b4f988f5eed31f8d7d2fc1464.tar.bz2
vcxsrv-39339fcb860cb48b4f988f5eed31f8d7d2fc1464.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl/glcpp/glcpp-parse.y')
-rw-r--r--mesalib/src/glsl/glcpp/glcpp-parse.y8
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);