From: Topher Lubaway Date: Wed, 13 Jun 2018 20:39:23 +0000 (-0700) Subject: Removes duplicate IS_CONSOLE from PR X-Git-Tag: v1.3.5~3^2~14^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec24f98ccab4057af684d70c18191bccf1ccbcc0;p=thirdparty%2Fzstd.git Removes duplicate IS_CONSOLE from PR I misunderstood that this function was included already --- diff --git a/programs/fileio.c b/programs/fileio.c index 7ec4114be..90d04d7f4 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 ***************************************/