From: Wolfgang Bumiller Date: Wed, 20 Feb 2013 22:08:50 +0000 (+0100) Subject: fix: don't mess up multiline macros in files ending with \r\n X-Git-Tag: before-library~110^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=80184b0d807ebab875fcc233cab557f5f9501a67;p=xonotic%2Fgmqcc.git fix: don't mess up multiline macros in files ending with \r\n --- diff --git a/lexer.c b/lexer.c index 42b21a1..d205e16 100644 --- a/lexer.c +++ b/lexer.c @@ -992,6 +992,8 @@ int lex_do(lex_file *lex) if (!lex->flags.mergelines || ch != '\\') break; ch = lex_getch(lex); + if (ch == '\r') + ch = lex_getch(lex); if (ch != '\n') { lex_ungetch(lex, ch); ch = '\\';