X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=lexer.c;h=4235613680f4e78c9b6b5d097f1b3adaae687f12;hb=f2380a2faa749fc3130abb13856eed888658d384;hp=bb601215fb11b2e97ae7a07a9e4355eec2e9ab31;hpb=3593a1b6b89ff690b8e89a31707468aad014b7b1;p=xonotic%2Fgmqcc.git

diff --git a/lexer.c b/lexer.c
index bb60121..4235613 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 = '\\';
@@ -1230,7 +1232,7 @@ int lex_do(lex_file *lex)
             /*
             case '+':
             case '-':
-            */
+            */ 
             case '*':
             case '/':
             case '<':
@@ -1350,7 +1352,7 @@ int lex_do(lex_file *lex)
         lex_tokench(lex, ch);
 
         nextch = lex_getch(lex);
-        if (nextch == '=') {
+        if (nextch == '=' || nextch == '*') {
             lex_tokench(lex, nextch);
         } else
             lex_ungetch(lex, nextch);