Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f7c4bdb authored by Casey Dahlin's avatar Casey Dahlin Committed by Android Git Automerger
Browse files

am 449274a7: am 8b25009d: Merge "Revert change to win32 isatty stub"

* commit '449274a7':
  Revert change to win32 isatty stub
parents 6b747f9d 449274a7
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -5,6 +5,13 @@
#include <string>
#include <iostream>

#ifdef _WIN32
int isatty(int  fd)
{
    return (fd == 0);
}
#endif

using std::string;
using std::cerr;
using std::endl;
+0 −7
Original line number Diff line number Diff line
@@ -7,13 +7,6 @@

extern YYSTYPE yylval;

#ifdef _WIN32
static inline int isatty(int fd)
{
  return 0;
}
#endif

// comment and whitespace handling
// these functions save a copy of the buffer
static void begin_extra_text(unsigned lineno, which_extra_text which);