diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2014-10-08 07:02:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2014-10-08 07:02:34 (GMT) |
| commit | 1c21bc5e140eb95beb1a5ade5b6d5811d1f0f1ff (patch) | |
| tree | 8755ccbd500239fdc07464096ddc1322c5fdced5 /generic | |
| parent | 313a3356228aabe06707e1638f7a84d1f648ebd2 (diff) | |
| download | tcl-1c21bc5e140eb95beb1a5ade5b6d5811d1f0f1ff.zip tcl-1c21bc5e140eb95beb1a5ade5b6d5811d1f0f1ff.tar.gz tcl-1c21bc5e140eb95beb1a5ade5b6d5811d1f0f1ff.tar.bz2 | |
Fix [59a2e78e54d3361c33b8cd6eef55d384d8abecd7|59a2e78e54] : tclWinTime.c does not compile with MSVC14.
Eliminate use of __MINGW32__ macro everywhare, as it is deprecated.
FossilOrigin-Name: c69f003888899c803c2c6c89bc97776345150a38
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 2 | ||||
| -rw-r--r-- | generic/tclAlloc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index af1af58..e915452 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -69,7 +69,7 @@ extern "C" { */ #ifndef __WIN32__ -# if defined(_WIN32) || defined(WIN32) || defined(__MINGW32__) || defined(__BORLANDC__) || (defined(__WATCOMC__) && defined(__WINDOWS_386__)) +# if defined(_WIN32) || defined(WIN32) || defined(__MSVCRT__) || defined(__BORLANDC__) || (defined(__WATCOMC__) && defined(__WINDOWS_386__)) # define __WIN32__ # ifndef WIN32 # define WIN32 diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c index 8d0a2cc..675e1a4 100644 --- a/generic/tclAlloc.c +++ b/generic/tclAlloc.c @@ -31,7 +31,7 @@ * until Tcl uses config.h properly. */ -#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__MSVCRT__) || defined(__BORLANDC__) typedef unsigned long caddr_t; #endif |