diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-09-15 16:57:02 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-09-15 16:57:02 (GMT) |
| commit | 7b0e937f9ff083f35896d0d13cf90d618812de49 (patch) | |
| tree | de7f5dad34e664debf6ad3b48e2deafd20741a11 /generic/tkMain.c | |
| parent | af244231877a2b478b9fb0b0481621e1c12fc561 (diff) | |
| parent | c40f0f6cefb57728ba9162a8509918ae31fd2210 (diff) | |
| download | tk-7b0e937f9ff083f35896d0d13cf90d618812de49.zip tk-7b0e937f9ff083f35896d0d13cf90d618812de49.tar.gz tk-7b0e937f9ff083f35896d0d13cf90d618812de49.tar.bz2 | |
merge 8.6
Diffstat (limited to 'generic/tkMain.c')
| -rw-r--r-- | generic/tkMain.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index c6c9835..32006b3 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -40,6 +40,9 @@ static const char DEFAULT_PRIMARY_PROMPT[] = "% "; * to strcmp here. */ #ifdef _WIN32 +#ifdef __cplusplus +extern "C" { +#endif /* Little hack to eliminate the need for "tclInt.h" here: Just copy a small portion of TclIntPlatStubs, just enough to make it work. See [600b72bfbc] */ @@ -50,6 +53,9 @@ typedef struct { int (*tclpIsAtty) (int fd); /* 16 */ } TclIntPlatStubs; extern const TclIntPlatStubs *tclIntPlatStubsPtr; +#ifdef __cplusplus +} +#endif # include "tkWinInt.h" #else # define TCHAR char @@ -417,7 +423,7 @@ StdinProc( count = Tcl_Gets(chan, &isPtr->line); - if (count == -1 && !isPtr->gotPartial) { + if ((count == -1) && !isPtr->gotPartial) { if (isPtr->tty) { Tcl_Exit(0); } else { |