Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #49 from zaic/master
Check windows EOLs on linux and vice versa.
  • Loading branch information
MikeMirzayanov committed Dec 28, 2017
2 parents 83617aa + a1bdeae commit 1b9c123
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion testlib.h
Expand Up @@ -166,6 +166,10 @@ const char* latestFeatures[] = {
# include <unistd.h>
#endif

#if defined(FOR_WINDOWS) && defined(FOR_LINUX)
#error Only one target system is allowed
#endif

#ifndef LLONG_MIN
#define LLONG_MIN (-9223372036854775807LL - 1)
#endif
Expand Down Expand Up @@ -3313,7 +3317,7 @@ bool InStream::eoln()
{
bool returnCr = false;

#ifdef ON_WINDOWS
#if (defined(ON_WINDOWS) && !defined(FOR_LINUX)) || defined(FOR_WINDOWS)
if (c != CR)
{
reader->unreadChar(c);
Expand Down

0 comments on commit 1b9c123

Please sign in to comment.