diff options
author | oehhar <harald.oehlmann@elmicron.de> | 2014-10-17 10:00:39 (GMT) |
---|---|---|
committer | oehhar <harald.oehlmann@elmicron.de> | 2014-10-17 10:00:39 (GMT) |
commit | 8e5b3b87a5b56c5d871a6d7e2107a516ca1d6212 (patch) | |
tree | 239e5dd2f89b978e46ca772b0d367cce522e8377 /win | |
parent | 822a2b50f72950b1305cf1a2983427b05c80859d (diff) | |
parent | ef89704696f7ce48c9e84dff959c72e2fd887959 (diff) | |
download | tcl-8e5b3b87a5b56c5d871a6d7e2107a516ca1d6212.zip tcl-8e5b3b87a5b56c5d871a6d7e2107a516ca1d6212.tar.gz tcl-8e5b3b87a5b56c5d871a6d7e2107a516ca1d6212.tar.bz2 |
Merge trunk
Diffstat (limited to 'win')
-rw-r--r-- | win/tclWinPort.h | 8 |
1 files changed, 4 insertions, 4 deletions
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 |