diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-06-16 16:27:01 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-06-16 16:27:01 (GMT) |
| commit | 3cbd3b2bede59c6fd03330ac014e626a0a776522 (patch) | |
| tree | 8e125264e32e68a389be074bfb8795cd212b9114 /generic/tclMain.c | |
| parent | 95fb48bf07be37ad0717475514d2c444602a0a6c (diff) | |
| parent | 4fac9b8d0fb5648943635cf4c956c9518e610921 (diff) | |
| download | tcl-bug_16828b3744.zip tcl-bug_16828b3744.tar.gz tcl-bug_16828b3744.tar.bz2 | |
Merge tip of core-8-6-branchbug_16828b3744
Diffstat (limited to 'generic/tclMain.c')
| -rw-r--r-- | generic/tclMain.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/generic/tclMain.c b/generic/tclMain.c index faea75a..927de7e 100644 --- a/generic/tclMain.c +++ b/generic/tclMain.c @@ -47,7 +47,7 @@ * we have to translate that to strcmp here. */ -#ifndef __WIN32__ +#ifndef _WIN32 # define TCHAR char # define TEXT(arg) arg # define _tcscmp strcmp @@ -80,7 +80,10 @@ 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. @@ -616,7 +619,7 @@ Tcl_MainEx( if (!Tcl_InterpDeleted(interp) && !Tcl_LimitExceeded(interp)) { Tcl_Obj *cmd = Tcl_ObjPrintf("exit %d", exitCode); - + Tcl_IncrRefCount(cmd); Tcl_EvalObjEx(interp, cmd, TCL_EVAL_GLOBAL); Tcl_DecrRefCount(cmd); @@ -729,7 +732,7 @@ TclFullFinalizationRequested(void) const char *fin; Tcl_DString ds; int finalize = 0; - + fin = TclGetEnv("TCL_FINALIZE_ON_EXIT", &ds); finalize = ((fin != NULL) && strcmp(fin, "0")); if (fin != NULL) { |