From: Kenneth Graunke <kenneth@whitecape.org>
Date: Fri, 18 Jun 2010 22:41:00 +0000 (-0700)
Subject: glcpp: Don't include newlines as part of #version-passthrough.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=03ee33809f2e5c6ecff827188ec33be5a9397c16;p=mesa.git

glcpp: Don't include newlines as part of #version-passthrough.

Fixes glcpp/tests/064-version.c.
---

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;