Mesa (master): glcpp: Fix `can not` to `cannot` in error message

Chris Forbes chrisf at kemper.freedesktop.org
Sat Dec 6 22:51:03 UTC 2014


Module: Mesa
Branch: master
Commit: 6b0196934509ac76293581f7ca69a3399ffb2e0a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b0196934509ac76293581f7ca69a3399ffb2e0a

Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Sun Dec  7 11:49:28 2014 +1300

glcpp: Fix `can not` to `cannot` in error message

Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>

---

 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 2877924..9b1a4f4 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 cdb9c29..3b736df 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.
 
 
 




More information about the mesa-commit mailing list