summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-06-09 11:41:31 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-06-09 11:41:31 (GMT)
commit1a7917d436c68f8263c2aaf25b7157202ea55866 (patch)
treef52b50c34cb2800c0234230800e8ed90302d3797 /generic
parentbeea8bd8239020a39d28b48993623c6f81fb4c81 (diff)
parent8afdb9286632c44763fe2b168b72cc6606ac52d4 (diff)
downloadtcl-1a7917d436c68f8263c2aaf25b7157202ea55866.zip
tcl-1a7917d436c68f8263c2aaf25b7157202ea55866.tar.gz
tcl-1a7917d436c68f8263c2aaf25b7157202ea55866.tar.bz2
Fix [e14c77b845] for MSVC6: Compilation error over typedef
Diffstat (limited to 'generic')
-rw-r--r--generic/tclDate.c8
-rw-r--r--generic/tclInt.h5
2 files changed, 3 insertions, 10 deletions
diff --git a/generic/tclDate.c b/generic/tclDate.c
index 6222a8a..e4dd000 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 6870f61..49a299c 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -48,9 +48,8 @@
#else
#include <string.h>
#endif
-#if defined(_WIN32)
-#include <crtdefs.h>
-#elif defined(STDC_HEADERS)
+#if defined(STDC_HEADERS) || defined(__STDC__) || defined(__C99__FUNC__) \
+ || defined(__cplusplus) || defined(_MSC_VER)
#include <stddef.h>
#else
typedef int ptrdiff_t;