summaryrefslogtreecommitdiffstats
path: root/generic/tclMain.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2021-01-08 21:07:57 (GMT)
committerdgp <dgp@users.sourceforge.net>2021-01-08 21:07:57 (GMT)
commit8229cd730444707ecef238b9678a5c8d779554f0 (patch)
tree28dbb787f28e59d75da785125db09451de89b1ff /generic/tclMain.c
parentdb51032d33e94c96859a874ec838558620720a09 (diff)
parent4e3cd053dbb7487dfdf2e93f5151d9bdd5f9865e (diff)
downloadtcl-8229cd730444707ecef238b9678a5c8d779554f0.zip
tcl-8229cd730444707ecef238b9678a5c8d779554f0.tar.gz
tcl-8229cd730444707ecef238b9678a5c8d779554f0.tar.bz2
Merge 8.7 (resolve conflicts)
Diffstat (limited to 'generic/tclMain.c')
-rw-r--r--generic/tclMain.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/generic/tclMain.c b/generic/tclMain.c
index 2c91129..943ca84 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -64,11 +64,6 @@ NewNativeObj(
* source directory to make their own modified versions).
*/
-#if defined _MSC_VER && _MSC_VER < 1900
-/* isatty is always defined on MSVC 14.0, but not necessarily as CRTIMPORT. */
-extern CRTIMPORT int isatty(int fd);
-#endif
-
/*
* The thread-local variables for this file's functions.
*/