summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-06-16 16:41:50 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-06-16 16:41:50 (GMT)
commit38f75a878db647a16f5198d88806af3e2cc1a9dd (patch)
treeb91fbc3e17c83e4e7a757c5362bd2e087e1cc4c3
parentb453d7479061b4f7fee8c55e790deab9f3e16de0 (diff)
parentacdd236f96616d9dd6707bc56fffacf95cb81b6a (diff)
downloadtcl-38f75a878db647a16f5198d88806af3e2cc1a9dd.zip
tcl-38f75a878db647a16f5198d88806af3e2cc1a9dd.tar.gz
tcl-38f75a878db647a16f5198d88806af3e2cc1a9dd.tar.bz2
merge 8.5
-rw-r--r--generic/tclDate.c8
-rw-r--r--generic/tclInt.h3
-rw-r--r--win/tclWinThrd.c11
3 files changed, 7 insertions, 15 deletions
diff --git a/generic/tclDate.c b/generic/tclDate.c
index 0bda22f..1adcf1e 100644
--- a/generic/tclDate.c
+++ b/generic/tclDate.c
@@ -359,14 +359,8 @@ typedef short int yytype_int16;
#ifndef YYSIZE_T
# ifdef __SIZE_TYPE__
# define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-# define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
# else
-# define YYSIZE_T unsigned int
+# define YYSIZE_T size_t
# endif
#endif
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 18574c3..6113f23 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -48,7 +48,8 @@
#else
#include <string.h>
#endif
-#ifdef STDC_HEADERS
+#if defined(STDC_HEADERS) || defined(__STDC__) || defined(__C99__FUNC__) \
+ || defined(__cplusplus) || defined(_MSC_VER)
#include <stddef.h>
#else
typedef int ptrdiff_t;
diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c
index 2413a78..7828e65 100644
--- a/win/tclWinThrd.c
+++ b/win/tclWinThrd.c
@@ -167,7 +167,6 @@ TclWinThreadStart(
* from TclpThreadCreate */
{
WinThread *winThreadPtr = (WinThread *) lpParameter;
- unsigned int fpmask;
LPTHREAD_START_ROUTINE lpOrigStartAddress;
LPVOID lpOrigParameter;
@@ -175,13 +174,11 @@ TclWinThreadStart(
return TCL_ERROR;
}
- fpmask = _MCW_EM | _MCW_RC | _MCW_PC;
-
-#if defined(_MSC_VER) && _MSC_VER >= 1200
- fpmask |= _MCW_DN;
+ _controlfp(winThreadPtr->fpControl, _MCW_EM | _MCW_RC | 0x03000000 /* _MCW_DN */
+#if !defined(_WIN64)
+ | _MCW_PC
#endif
-
- _controlfp(winThreadPtr->fpControl, fpmask);
+ );
lpOrigStartAddress = winThreadPtr->lpStartAddress;
lpOrigParameter = winThreadPtr->lpParameter;