diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-11 15:25:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-11 15:25:12 (GMT) |
| commit | 353247a615b7fd61f9d3d0e8b83932117b972cf0 (patch) | |
| tree | b3ec63db1c5a72053b4a6942ed9641109cee0d60 /generic/tkMain.c | |
| parent | bd33c4f3a417d27aebd67b95239b3efd2238dac9 (diff) | |
| download | tk-353247a615b7fd61f9d3d0e8b83932117b972cf0.zip tk-353247a615b7fd61f9d3d0e8b83932117b972cf0.tar.gz tk-353247a615b7fd61f9d3d0e8b83932117b972cf0.tar.bz2 | |
Fix [4fb812af90]: Build Failure on msys2 with gcc10. Also add more __cplusplus-related scope blocks around (internal) MODULE_SCOPE definitions.
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 879a7c0..b2fa845 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -32,6 +32,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] */ @@ -41,7 +44,10 @@ typedef struct TclIntPlatStubs { void (*dummy[16]) (void); /* dummy entries 0-15, not used */ int (*tclpIsAtty) (int fd); /* 16 */ } TclIntPlatStubs; -const TclIntPlatStubs *tclIntPlatStubsPtr; +extern const TclIntPlatStubs *tclIntPlatStubsPtr; +#ifdef __cplusplus +} +#endif # include "tkWinInt.h" #else # define TCHAR char |