summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-10-08 07:02:34 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-10-08 07:02:34 (GMT)
commit6c6b3efbe49179c32ae0244e20c9d4096cb51fbe (patch)
tree8755ccbd500239fdc07464096ddc1322c5fdced5
parenta21e1b769836e5b589d00985420d87e74c8010e3 (diff)
downloadtcl-6c6b3efbe49179c32ae0244e20c9d4096cb51fbe.zip
tcl-6c6b3efbe49179c32ae0244e20c9d4096cb51fbe.tar.gz
tcl-6c6b3efbe49179c32ae0244e20c9d4096cb51fbe.tar.bz2
Fix [59a2e78e54d3361c33b8cd6eef55d384d8abecd7|59a2e78e54] : tclWinTime.c does not compile with MSVC14.
Eliminate use of __MINGW32__ macro everywhare, as it is deprecated.
-rw-r--r--generic/tcl.h2
-rw-r--r--generic/tclAlloc.c2
-rw-r--r--win/tclWinPort.h8
3 files changed, 6 insertions, 6 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
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index ea6d8f8..b2bf1d7 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -346,17 +346,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.
@@ -425,7 +425,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