Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '8b25009d92626e7f1bb3b8fdf2774df20ec7a769':
  Revert change to win32 isatty stub
This commit is contained in:
Casey Dahlin
2015-09-11 02:41:51 +00:00
committed by Android Git Automerger
parent 3230b2b2b7 8b25009d92
commit 449274a774
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/aidl/aidl_language.cpp
View File

@@ -5,6 +5,13 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#ifdef _WIN32
int isatty(int fd)
{
return (fd == 0);
}
#endif
using std::string; using std::string;
using std::cerr; using std::cerr;
using std::endl; using std::endl;

7
tools/aidl/aidl_language_l.l
View File

@@ -7,13 +7,6 @@
extern YYSTYPE yylval; extern YYSTYPE yylval;
#ifdef _WIN32
static inline int isatty(int fd)
{
return 0;
}
#endif
// comment and whitespace handling // comment and whitespace handling
// these functions save a copy of the buffer // these functions save a copy of the buffer
static void begin_extra_text(unsigned lineno, which_extra_text which); static void begin_extra_text(unsigned lineno, which_extra_text which);