summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2010-06-18 15:41:00 -0700
committerKenneth Graunke <[email protected]>2010-06-21 12:31:04 -0700
commit03ee33809f2e5c6ecff827188ec33be5a9397c16 (patch)
tree67b433d37e9529207ed5df55884abd8910022b4e
parent214632f527c2698602580038763ec72154ca2109 (diff)
glcpp: Don't include newlines as part of #version-passthrough.
Fixes glcpp/tests/064-version.c.
-rw-r--r--glcpp/glcpp-lex.l2
1 files changed, 1 insertions, 1 deletions
diff --git a/glcpp/glcpp-lex.l b/glcpp/glcpp-lex.l
index 3eb0fbc1d3e..0dea9950015 100644
--- a/glcpp/glcpp-lex.l
+++ b/glcpp/glcpp-lex.l
@@ -80,7 +80,7 @@ HEXADECIMAL_INTEGER 0[xX][0-9a-fA-F]+[uU]?
/* glcpp doesn't handle #extension, #version, or #pragma directives.
* Simply pass them through to the main compiler's lexer/parser. */
-{HASH}(extension|version|pragma).*\n {
+{HASH}(extension|version|pragma)[^\n]+ {
yylval->str = xtalloc_strdup (yyextra, yytext);
yylineno++;
yycolumn = 0;