From 6b0196934509ac76293581f7ca69a3399ffb2e0a Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sun, 7 Dec 2014 11:49:28 +1300 Subject: [PATCH] glcpp: Fix `can not` to `cannot` in error message Signed-off-by: Chris Forbes --- src/glsl/glcpp/glcpp-parse.y | 2 +- src/glsl/glcpp/tests/120-undef-builtin.c.expected | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y index 287792439b5..9b1a4f40112 100644 --- a/src/glsl/glcpp/glcpp-parse.y +++ b/src/glsl/glcpp/glcpp-parse.y @@ -293,7 +293,7 @@ control_line_success: || strcmp("__VERSION__", $4) == 0 || strncmp("GL_", $4, 3) == 0) glcpp_error(& @1, parser, "Built-in (pre-defined)" - " macro names can not be undefined."); + " macro names cannot be undefined."); macro = hash_table_find (parser->defines, $4); if (macro) { diff --git a/src/glsl/glcpp/tests/120-undef-builtin.c.expected b/src/glsl/glcpp/tests/120-undef-builtin.c.expected index cdb9c29adfb..3b736df378e 100644 --- a/src/glsl/glcpp/tests/120-undef-builtin.c.expected +++ b/src/glsl/glcpp/tests/120-undef-builtin.c.expected @@ -1,6 +1,6 @@ -0:1(1): preprocessor error: Built-in (pre-defined) macro names can not be undefined. -0:2(1): preprocessor error: Built-in (pre-defined) macro names can not be undefined. -0:3(1): preprocessor error: Built-in (pre-defined) macro names can not be undefined. +0:1(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined. +0:2(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined. +0:3(1): preprocessor error: Built-in (pre-defined) macro names cannot be undefined. -- 2.30.2