Revert "glcpp: Demote "macro redefined" from an error to a warning"

[mesa.git] / src / glsl / glcpp / glcpp-parse.c

diff --git a/src/glsl/glcpp/glcpp-parse.c b/src/glsl/glcpp/glcpp-parse.c
index 2bf96e035e1238f750b2a801262ce5f5a1151750..8567bda1e5d786deebc5c67d221769b4edff7f72 100644 (file)
--- a/src/glsl/glcpp/glcpp-parse.c
+++ b/src/glsl/glcpp/glcpp-parse.c
@@ -4012,8 +4012,8 @@ _define_object_macro (glcpp_parser_t *parser,
                        talloc_free (macro);
                        return;
                }
-               glcpp_warning (loc, parser, "Redefinition of macro %s\n",
-                              identifier);
+               glcpp_error (loc, parser, "Redefinition of macro %s\n",
+                            identifier);
        }
 
        hash_table_insert (parser->defines, macro, identifier);
@@ -4043,8 +4043,8 @@ _define_function_macro (glcpp_parser_t *parser,
                        talloc_free (macro);
                        return;
                }
-               glcpp_warning (loc, parser, "Redefinition of macro %s\n",
-                              identifier);
+               glcpp_error (loc, parser, "Redefinition of macro %s\n",
+                            identifier);
        }
 
        hash_table_insert (parser->defines, macro, identifier);