diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-01-12 21:09:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-01-12 21:09:28 (GMT) |
| commit | 6fb4e398d601951ffbc80a9156685beec71ebe2e (patch) | |
| tree | d1557d52d25f268e4d2b384ea0c7c343dc431393 /generic/tclCkalloc.c | |
| parent | 2161463b5bc87cbef712465067c0b4fde52a699d (diff) | |
| parent | 05dc6d00c28c40fef2b65cf96d5753927599c4d5 (diff) | |
| download | tcl-6fb4e398d601951ffbc80a9156685beec71ebe2e.zip tcl-6fb4e398d601951ffbc80a9156685beec71ebe2e.tar.gz tcl-6fb4e398d601951ffbc80a9156685beec71ebe2e.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tclCkalloc.c')
| -rw-r--r-- | generic/tclCkalloc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c index f2394b1..c664783 100644 --- a/generic/tclCkalloc.c +++ b/generic/tclCkalloc.c @@ -41,7 +41,7 @@ typedef struct MemTag { * last field in the structure. */ } MemTag; -#define TAG_SIZE(bytesInString) ((offsetof(MemTag, string) + 1) + bytesInString) +#define TAG_SIZE(bytesInString) ((offsetof(MemTag, string) + 1) + (bytesInString)) static MemTag *curTagPtr = NULL;/* Tag to use in all future mem_headers (set * by "memory tag" command). */ @@ -131,10 +131,10 @@ static int ckallocInit = 0; * Prototypes for procedures defined in this file: */ -static int CheckmemCmd(ClientData clientData, +static int CheckmemCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); -static int MemoryCmd(ClientData clientData, +static int MemoryCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); static void ValidateMemory(struct mem_header *memHeaderP, @@ -177,7 +177,7 @@ TclInitDbCkalloc(void) int TclDumpMemoryInfo( - ClientData clientData, + void *clientData, int flags) { char buf[1024]; @@ -810,7 +810,7 @@ Tcl_AttemptRealloc( */ static int MemoryCmd( - TCL_UNUSED(ClientData), + TCL_UNUSED(void *), Tcl_Interp *interp, int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Obj values of arguments. */ @@ -980,13 +980,13 @@ MemoryCmd( * *---------------------------------------------------------------------- */ -static int CheckmemCmd(ClientData clientData, +static int CheckmemCmd(void *clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); static int CheckmemCmd( - TCL_UNUSED(ClientData), + TCL_UNUSED(void *), Tcl_Interp *interp, /* Interpreter for evaluation. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Obj values of arguments. */ @@ -1240,7 +1240,7 @@ Tcl_ValidateAllMemory( int TclDumpMemoryInfo( - TCL_UNUSED(ClientData), + TCL_UNUSED(void *), TCL_UNUSED(int) /*flags*/) { return 1; |