summaryrefslogtreecommitdiffstats
path: root/generic/tkMain.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-02-28 12:05:02 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-02-28 12:05:02 (GMT)
commit1d2fbf0b67d3ebfca3632d712654d9bc01af76dd (patch)
tree2ec07b8daf001f18e7432b25d0c9167aaa3838ec /generic/tkMain.c
parent8ef8de11eed562a7015b9e8ff11a6a77124b1d19 (diff)
parent4d4bf9a051a30dad87a2b518e2641851b702dd3c (diff)
downloadtk-1d2fbf0b67d3ebfca3632d712654d9bc01af76dd.zip
tk-1d2fbf0b67d3ebfca3632d712654d9bc01af76dd.tar.gz
tk-1d2fbf0b67d3ebfca3632d712654d9bc01af76dd.tar.bz2
Implement TIP #557: C++ support for Tcl
Diffstat (limited to 'generic/tkMain.c')
-rw-r--r--generic/tkMain.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 64eedb2..948f811 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -35,13 +35,13 @@ static const char DEFAULT_PRIMARY_PROMPT[] = "% ";
/* 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] */
-typedef struct {
+typedef struct TclIntPlatStubs {
int magic;
void *hooks;
void (*dummy[16]) (void); /* dummy entries 0-15, not used */
int (*tclpIsAtty) (int fd); /* 16 */
} TclIntPlatStubs;
-extern const TclIntPlatStubs *tclIntPlatStubsPtr;
+const TclIntPlatStubs *tclIntPlatStubsPtr;
# include "tkWinInt.h"
#else
# define TCHAR char
@@ -403,9 +403,10 @@ StdinProc(
char *cmd;
int code;
size_t count;
- InteractiveState *isPtr = clientData;
+ InteractiveState *isPtr = (InteractiveState *)clientData;
Tcl_Channel chan = isPtr->input;
Tcl_Interp *interp = isPtr->interp;
+ (void)mask;
count = (size_t)Tcl_Gets(chan, &isPtr->line);