diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-13 16:00:45 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-13 16:00:45 (GMT) |
| commit | 25b533a524ec7cd04af44bbcb4e54687729aaf71 (patch) | |
| tree | d28ed6dda7d4680a83cf26aac39a3c81e6c881d6 | |
| parent | b5e611c7ee0ee135b64456e6851d009679adfb67 (diff) | |
| parent | 564c7bd9ebe0c41d52f5e976f77fa7a24819237a (diff) | |
| download | tcl-25b533a524ec7cd04af44bbcb4e54687729aaf71.zip tcl-25b533a524ec7cd04af44bbcb4e54687729aaf71.tar.gz tcl-25b533a524ec7cd04af44bbcb4e54687729aaf71.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tcl.h | 4 | ||||
| -rw-r--r-- | generic/tclInterp.c | 4 | ||||
| -rw-r--r-- | generic/tclPreserve.c | 2 | ||||
| -rw-r--r-- | generic/tclZipfs.c | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 9f6d15f..54a4e28 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2132,7 +2132,11 @@ typedef struct Tcl_Config { */ typedef void (Tcl_LimitHandlerProc) (void *clientData, Tcl_Interp *interp); +#if TCL_MAJOR_VERSION > 8 +#define Tcl_LimitHandlerDeleteProc Tcl_FreeProc +#else typedef void (Tcl_LimitHandlerDeleteProc) (void *clientData); +#endif #if 0 /* diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 3886fc7..a6595fc 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -3615,8 +3615,8 @@ Tcl_LimitAddHandler( * Convert everything into a real deletion callback. */ - if (deleteProc == (Tcl_LimitHandlerDeleteProc *) TCL_DYNAMIC) { - deleteProc = (Tcl_LimitHandlerDeleteProc *) TclpFree; + if (deleteProc == TCL_DYNAMIC) { + deleteProc = TclpFree; } /* diff --git a/generic/tclPreserve.c b/generic/tclPreserve.c index ff4b45b..36a9537 100644 --- a/generic/tclPreserve.c +++ b/generic/tclPreserve.c @@ -292,7 +292,7 @@ Tcl_EventuallyFree( if (freeProc == TCL_DYNAMIC) { Tcl_Free(clientData); } else { - freeProc((char *)clientData); + freeProc(clientData); } } diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 3a1f053..4f06ab3 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -1436,7 +1436,7 @@ ZipFSFindTOC( goto error; } - /* + /* * eocdPtr -> End of Central Directory (EOCD) record at this point. * Note this is not same as "end of Central Directory" :-) as EOCD * is a record/structure in the ZIP spec terminology |