Newlines in multi-line comments don't count as a newline.

TRAC #15791 Issue=114 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@569 736b8ea6-26fd-11df-bfd4-992fa37f6226

Newlines in multi-line comments don't count as a newline.
62f20f9d · daniel@transgaming.com · 3d8115ff · 62f20f9d
Commit 62f20f9d authored Mar 09, 2011 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

scanner.c src/compiler/preprocessor/scanner.c +0 -5

No files found.
--- a/src/compiler/preprocessor/scanner.c
+++ b/src/compiler/preprocessor/scanner.c
@@ -558,11 +558,9 @@ static int byte_scan(InputSrc *in, yystypepp * yylvalpp)
                    return -1;
                return '\n';
            } else if (ch == '*') {
-                int nlcount = 0;
                ch = cpp->currentInput->getch(cpp->currentInput, yylvalpp);
                do {
                    while (ch != '*') {
-                        if (ch == '\n') nlcount++;
                        if (ch == EOF) {
                            CPPErrorToInfoLog("EOF IN COMMENT");
                            return -1;
@@ -575,9 +573,6 @@ static int byte_scan(InputSrc *in, yystypepp * yylvalpp)
                        return -1;
                    }
                } while (ch != '/');
-                if (nlcount) {
-                    return '\n';
-                }
                // Go try it again...
            } else if (ch == '=') {
                return CPP_DIV_ASSIGN;