summaryrefslogtreecommitdiffstats
path: root/win/tclWinPort.h
diff options
context:
space:
mode:
Diffstat (limited to 'win/tclWinPort.h')
-rw-r--r--win/tclWinPort.h22
1 files changed, 10 insertions, 12 deletions
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index c8013e6..6dbb12a 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -14,6 +14,10 @@
#ifndef _TCLWINPORT
#define _TCLWINPORT
+#if !defined(_WIN64) && defined(BUILD_tcl)
+# define __MINGW_USE_VC2005_COMPAT
+#endif
+
/*
* We must specify the lower version we intend to support.
*
@@ -26,9 +30,6 @@
#ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
#endif
-#ifndef __MSVCRT_VERSION__
-# define __MSVCRT_VERSION__ 0x0601
-#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
@@ -80,6 +81,7 @@ typedef DWORD_PTR * PDWORD_PTR;
*---------------------------------------------------------------------------
*/
+#include <time.h>
#include <wchar.h>
#include <io.h>
#include <errno.h>
@@ -90,11 +92,9 @@ typedef DWORD_PTR * PDWORD_PTR;
#include <signal.h>
#include <limits.h>
-#ifndef strncasecmp
-# define strncasecmp strnicmp
-#endif
-#ifndef strcasecmp
-# define strcasecmp stricmp
+#ifndef __GNUC__
+# define strncasecmp _strnicmp
+# define strcasecmp _stricmp
#endif
/*
@@ -112,7 +112,6 @@ typedef DWORD_PTR * PDWORD_PTR;
# endif /* __BORLANDC__ */
#endif /* __MWERKS__ */
-#include <time.h>
/*
* The following defines redefine the Windows Socket errors as
* BSD errors so Tcl_PosixError can do the right thing.
@@ -466,11 +465,10 @@ typedef DWORD_PTR * PDWORD_PTR;
* including the *printf family and others. Tell it to shut up.
* (_MSC_VER is 1200 for VC6, 1300 or 1310 for vc7.net, 1400 for 8.0)
*/
-#if _MSC_VER >= 1400
-#pragma warning(disable:4996)
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+# pragma warning(disable:4996)
#endif
-
/*
*---------------------------------------------------------------------------
* The following macros and declarations represent the interface between