summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/glsl/glcpp/glcpp-parse.c2
-rw-r--r--src/glsl/glcpp/glcpp-parse.y2
-rw-r--r--src/glsl/glcpp/tests/081-elif-without-expression.c.expected1
3 files changed, 2 insertions, 3 deletions
diff --git a/src/glsl/glcpp/glcpp-parse.c b/src/glsl/glcpp/glcpp-parse.c
index 498d018764..05bb7ca48b 100644
--- a/src/glsl/glcpp/glcpp-parse.c
+++ b/src/glsl/glcpp/glcpp-parse.c
@@ -1950,7 +1950,7 @@ yyreduce:
if (parser->skip_stack &&
parser->skip_stack->type == SKIP_TO_ELSE)
{
- glcpp_error(& (yylsp[(1) - (2)]), parser, "#elif needs an expression");
+ glcpp_error(& (yylsp[(1) - (2)]), parser, "#elif with no expression");
}
else
{
diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 643c449d0e..795030ecfe 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -276,7 +276,7 @@ control_line:
if (parser->skip_stack &&
parser->skip_stack->type == SKIP_TO_ELSE)
{
- glcpp_error(& @1, parser, "#elif needs an expression");
+ glcpp_error(& @1, parser, "#elif with no expression");
}
else
{
diff --git a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected b/src/glsl/glcpp/tests/081-elif-without-expression.c.expected
index 37dcdc3238..974f0f550e 100644
--- a/src/glsl/glcpp/tests/081-elif-without-expression.c.expected
+++ b/src/glsl/glcpp/tests/081-elif-without-expression.c.expected
@@ -3,4 +3,3 @@
-