summaryrefslogtreecommitdiff
path: root/tools/preproc/asm_file.cpp
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2019-08-29 10:06:43 -0400
committerhuderlem <huderlem@gmail.com>2019-08-29 16:37:58 -0500
commit06af013e506fe4813724eaeca040c2745ae9e5ad (patch)
treecffea9cc7431fe6b02af332f18cb0ba636d17f95 /tools/preproc/asm_file.cpp
parentbc159dbb03735db55e6a09bb7947dccc70d0532b (diff)
allow CRLF line endings in asm files for preproc
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 383010aa3..98805c952 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
{