diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-07-01 15:26:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-07-01 15:26:25 (GMT) |
| commit | 2384f8aa81b8d3ba682e5192baa05a9b02039f3f (patch) | |
| tree | d0c16d9b05d45d0ad451ac21912d81fbdfa88a9a | |
| parent | d51b6f7045d7043fa3ef9c8de6823a3b524ba50e (diff) | |
| parent | 64919a8531c279f01efec1720397b1f2bbdd24c2 (diff) | |
| download | tcl-2384f8aa81b8d3ba682e5192baa05a9b02039f3f.zip tcl-2384f8aa81b8d3ba682e5192baa05a9b02039f3f.tar.gz tcl-2384f8aa81b8d3ba682e5192baa05a9b02039f3f.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tcl.h | 2 | ||||
| -rw-r--r-- | generic/tclOO.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 285c1f5..ea9e6f8 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2559,7 +2559,7 @@ EXTERN const char *TclZipfs_AppHook(int *argc, char ***argv); */ #define Tcl_GetHashValue(h) ((h)->clientData) -#define Tcl_SetHashValue(h, value) ((h)->clientData = (ClientData) (value)) +#define Tcl_SetHashValue(h, value) ((h)->clientData = (void *)(value)) #define Tcl_GetHashKey(tablePtr, h) \ ((void *) (((tablePtr)->keyType == TCL_ONE_WORD_KEYS || \ (tablePtr)->keyType == TCL_CUSTOM_PTR_KEYS) \ diff --git a/generic/tclOO.c b/generic/tclOO.c index 56423e1..5bd687a 100644 --- a/generic/tclOO.c +++ b/generic/tclOO.c @@ -262,10 +262,10 @@ TclOOInit( #ifndef TCL_NO_DEPRECATED Tcl_PkgProvideEx(interp, "TclOO", TCLOO_PATCHLEVEL, - (void *) &tclOOStubs); + &tclOOStubs); #endif return Tcl_PkgProvideEx(interp, "tcl::oo", TCLOO_PATCHLEVEL, - (void *) &tclOOStubs); + &tclOOStubs); } /* |