From ec24f98ccab4057af684d70c18191bccf1ccbcc0 Mon Sep 17 00:00:00 2001 From: Topher Lubaway Date: Wed, 13 Jun 2018 13:39:23 -0700 Subject: [PATCH] Removes duplicate IS_CONSOLE from PR I misunderstood that this function was included already --- programs/fileio.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/programs/fileio.c b/programs/fileio.c index 7ec4114b..90d04d7f 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -57,21 +57,11 @@ # include #endif -// Multi-OS support for determining if terminal is tty -#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(_WIN32) || \ - defined(__CYGWIN__) -#include /* _isatty */ -#include -#define IS_CONSOLE(stdStream) _isatty(_fileno(stdStream)) -#elif defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || (defined(__APPLE__) && defined(__MACH__)) || \ - defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) /* https://sourceforge.net/p/predef/wiki/OperatingSystems/ */ -#include /* isatty */ -#define IS_CONSOLE(stdStream) isatty(fileno(stdStream)) -#else -#define IS_CONSOLE(stdStream) 0 +#if defined (_MSC_VER) +# include +# include #endif - /*-************************************* * Constants ***************************************/