]> git.xonotic.org Git - xonotic/gmqcc.git/commitdiff
fix: don't mess up multiline macros in files ending with \r\n
authorWolfgang Bumiller <blub@speed.at>
Wed, 20 Feb 2013 22:08:50 +0000 (23:08 +0100)
committerWolfgang Bumiller <blub@speed.at>
Wed, 20 Feb 2013 22:08:50 +0000 (23:08 +0100)
lexer.c

diff --git a/lexer.c b/lexer.c
index 42b21a1a6cd7de46bd45aa21b227cc412a4fbdec..d205e163f11091f05fdfd786684e83eed8dcafcb 100644 (file)
--- 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 (!lex->flags.mergelines || ch != '\\')
             break;
         ch = lex_getch(lex);
+        if (ch == '\r')
+            ch = lex_getch(lex);
         if (ch != '\n') {
             lex_ungetch(lex, ch);
             ch = '\\';
         if (ch != '\n') {
             lex_ungetch(lex, ch);
             ch = '\\';