Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow CRLF line endings in asm files for preproc

This commit is contained in:
garak 2019-08-29 10:02:56 -04:00 committed by huderlem
parent ad941680d8
commit b420b98d63
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/preproc/asm_file.cpp
View File

@ -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
{