diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-06-16 16:41:50 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-06-16 16:41:50 (GMT) |
| commit | 38f75a878db647a16f5198d88806af3e2cc1a9dd (patch) | |
| tree | b91fbc3e17c83e4e7a757c5362bd2e087e1cc4c3 /generic | |
| parent | b453d7479061b4f7fee8c55e790deab9f3e16de0 (diff) | |
| parent | acdd236f96616d9dd6707bc56fffacf95cb81b6a (diff) | |
| download | tcl-38f75a878db647a16f5198d88806af3e2cc1a9dd.zip tcl-38f75a878db647a16f5198d88806af3e2cc1a9dd.tar.gz tcl-38f75a878db647a16f5198d88806af3e2cc1a9dd.tar.bz2 | |
merge 8.5
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclDate.c | 8 | ||||
| -rw-r--r-- | generic/tclInt.h | 3 |
2 files changed, 3 insertions, 8 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; |