summaryrefslogtreecommitdiff
path: root/src/mesa/shader/program_lexer.l
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2009-08-22 19:19:40 -0700
committerIan Romanick <ian.d.romanick@intel.com>2009-08-23 11:15:32 -0700
commit9b70c33e735ff060ddad7d0b501d19c670f41618 (patch)
treef5165ab420416e2f21aa579e9b00c23de4409060 /src/mesa/shader/program_lexer.l
parent7a05a4c65cdb109ed43ee4587492f4637d3707b3 (diff)
ARB prog lexer: Fix lexer to eat both DOS and Unix line endings
Diffstat (limited to 'src/mesa/shader/program_lexer.l')
-rw-r--r--src/mesa/shader/program_lexer.l2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/program_lexer.l b/src/mesa/shader/program_lexer.l
index 05978311ec6..c50c7c57399 100644
--- a/src/mesa/shader/program_lexer.l
+++ b/src/mesa/shader/program_lexer.l
@@ -468,7 +468,7 @@ ARRAYSHADOW2D { return_token_or_IDENTIFIER(require_ARB_fp && require
yylloc->last_column = 1;
yylloc->position++;
}
-[ \t]+ /* eat whitespace */ ;
+[ \t\r]+ /* eat whitespace */ ;
#.*$ /* eat comments */ ;
. { return yytext[0]; }
%%