diff options
author | dgp <dgp@users.sourceforge.net> | 2021-01-08 21:07:57 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2021-01-08 21:07:57 (GMT) |
commit | 8229cd730444707ecef238b9678a5c8d779554f0 (patch) | |
tree | 28dbb787f28e59d75da785125db09451de89b1ff /generic/tclAlloc.c | |
parent | db51032d33e94c96859a874ec838558620720a09 (diff) | |
parent | 4e3cd053dbb7487dfdf2e93f5151d9bdd5f9865e (diff) | |
download | tcl-8229cd730444707ecef238b9678a5c8d779554f0.zip tcl-8229cd730444707ecef238b9678a5c8d779554f0.tar.gz tcl-8229cd730444707ecef238b9678a5c8d779554f0.tar.bz2 |
Merge 8.7 (resolve conflicts)
Diffstat (limited to 'generic/tclAlloc.c')
-rw-r--r-- | generic/tclAlloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclAlloc.c b/generic/tclAlloc.c index f9252d8..5070f96 100644 --- a/generic/tclAlloc.c +++ b/generic/tclAlloc.c @@ -31,7 +31,7 @@ * until Tcl uses config.h properly. */ -#if defined(_MSC_VER) || defined(__MSVCRT__) || defined(__BORLANDC__) +#if defined(_MSC_VER) || defined(__MSVCRT__) typedef size_t caddr_t; #endif |