diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-10-08 07:11:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-10-08 07:11:53 (GMT) |
| commit | 6567599f3a6075b0a76cf29288488901aa6a6579 (patch) | |
| tree | ac75347fef9ced51a7fd7ed1e952fc85099752e0 | |
| parent | 46880aeb57e56eadf65fc6aba4c1240513456458 (diff) | |
| parent | 6c6b3efbe49179c32ae0244e20c9d4096cb51fbe (diff) | |
| download | tcl-6567599f3a6075b0a76cf29288488901aa6a6579.zip tcl-6567599f3a6075b0a76cf29288488901aa6a6579.tar.gz tcl-6567599f3a6075b0a76cf29288488901aa6a6579.tar.bz2 | |
Fix [59a2e78e54d3361c33b8cd6eef55d384d8abecd7|59a2e78e54] : tclWinTime.c does not compile with MSVC14.
Eliminate use of __MINGW32__ macro everywhere, as it is deprecated.
| -rw-r--r-- | generic/tclAlloc.c | 2 | ||||
| -rw-r--r-- | win/tclWinPort.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c index ae61e85..cda1f38 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 diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 652cd06..ca6b2bf 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -433,17 +433,17 @@ typedef DWORD_PTR * PDWORD_PTR; * EDEADLK as the same value, which confuses Tcl_ErrnoId(). */ -#if defined(_MSC_VER) || defined(__MINGW32__) +#if defined(_MSC_VER) || defined(__MSVCRT__) # define environ _environ # if defined(_MSC_VER) && (_MSC_VER < 1600) # define hypot _hypot # endif # define exception _exception # undef EDEADLOCK -# if defined(__MINGW32__) && !defined(__MSVCRT__) +# if defined(_MSC_VER) && (_MSC_VER >= 1700) # define timezone _timezone # endif -#endif /* _MSC_VER || __MINGW32__ */ +#endif /* _MSC_VER || __MSVCRT__ */ /* * Borland's timezone and environ functions. @@ -505,7 +505,7 @@ typedef DWORD_PTR * PDWORD_PTR; * Msvcrt's putenv() copies the string rather than takes ownership of it. */ -#if defined(_MSC_VER) || defined(__MINGW32__) +#if defined(_MSC_VER) || defined(__MSVCRT__) # define HAVE_PUTENV_THAT_COPIES 1 #endif |