aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/glcpp/glcpp-parse.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-28 08:01:47 +0000
committermarha <marha@users.sourceforge.net>2011-01-28 08:01:47 +0000
commitdc0f390b45a3037c85163b8a9e945a31f5756690 (patch)
tree317b992cf88d5a7df8c9b9c7c419aef42246fa3f /mesalib/src/glsl/glcpp/glcpp-parse.c
parent987904f9692c374b81547ebe0bd3bad5a279db48 (diff)
downloadvcxsrv-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.c')
-rw-r--r--mesalib/src/glsl/glcpp/glcpp-parse.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.c b/mesalib/src/glsl/glcpp/glcpp-parse.c
index 8567bda1e..2bf96e035 100644
--- a/mesalib/src/glsl/glcpp/glcpp-parse.c
+++ b/mesalib/src/glsl/glcpp/glcpp-parse.c
@@ -4012,8 +4012,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);
@@ -4043,8 +4043,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);