summaryrefslogtreecommitdiff
path: root/tools/preproc/asm_file.cpp
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2019-09-04 13:18:49 -0700
committerDiegoisawesome <diego@domoreaweso.me>2019-09-04 13:18:49 -0700
commita7ef6c4cbf5ef481281917685a633ccd842335d5 (patch)
tree44674b0580f41426eb5112e31cdc0245237d1666 /tools/preproc/asm_file.cpp
parent1ec2c86089fd933a46ef405da63c131aee52d7e0 (diff)
Update tool sources and binaries from pokeemeraldHEADmaster
Diffstat (limited to 'tools/preproc/asm_file.cpp')
-rw-r--r--tools/preproc/asm_file.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp
index 383010a..98805c9 100644
--- a/tools/preproc/asm_file.cpp
+++ b/tools/preproc/asm_file.cpp
@@ -475,9 +475,11 @@ void AsmFile::ExpectEmptyRestOfLine()
m_lineStart = m_pos;
m_lineNum++;
}
- else if (m_buffer[m_pos] == '\r')
+ else if (m_buffer[m_pos] == '\r' && m_buffer[m_pos + 1] == '\n')
{
- RaiseError("only Unix-style LF newlines are supported");
+ m_pos += 2;
+ m_lineStart = m_pos;
+ m_lineNum++;
}
else
{