From 3e50f04dfa034185e8b661940d90542e2e14f85a Mon Sep 17 00:00:00 2001 From: Casey Dahlin Date: Thu, 10 Sep 2015 19:13:49 -0700 Subject: Revert change to win32 isatty stub This is attempting to fix build breakage caused by redefining the isatty stub for win32. Change-Id: I5f854934cb9d2b2981f6349045e85d9ad737aa77 Signed-off-by: Casey Dahlin --- tools/aidl/aidl_language.cpp | 7 +++++++ tools/aidl/aidl_language_l.l | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/aidl/aidl_language.cpp b/tools/aidl/aidl_language.cpp index e2540658b620..4eb3faecb574 100644 --- a/tools/aidl/aidl_language.cpp +++ b/tools/aidl/aidl_language.cpp @@ -5,6 +5,13 @@ #include #include +#ifdef _WIN32 +int isatty(int fd) +{ + return (fd == 0); +} +#endif + using std::string; using std::cerr; using std::endl; diff --git a/tools/aidl/aidl_language_l.l b/tools/aidl/aidl_language_l.l index b8e53a83ebd8..540b550035ff 100644 --- a/tools/aidl/aidl_language_l.l +++ b/tools/aidl/aidl_language_l.l @@ -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); -- cgit v1.2.3-59-g8ed1b