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 | 63acce0c26f00ce8e3d4acb5840db0105f47631d (patch) | |
| tree | 239e5dd2f89b978e46ca772b0d367cce522e8377 /win | |
| parent | d9a8b078d1c03a51b8835666ddd27e0e54a2817d (diff) | |
| parent | ceff856085045650b5b10e2d2fea1355ba78e4c4 (diff) | |
| download | tcl-63acce0c26f00ce8e3d4acb5840db0105f47631d.zip tcl-63acce0c26f00ce8e3d4acb5840db0105f47631d.tar.gz tcl-63acce0c26f00ce8e3d4acb5840db0105f47631d.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 |