summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--generic/tcl.decls2
-rw-r--r--generic/tclDecls.h5
-rw-r--r--generic/tclHash.c2
-rw-r--r--generic/tclVar.c2
5 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 44e5814..6383bf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-06 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tcl.decls: Tcl_HashStats does not return a CONST
+ * generic/tclDecls.h (Backported from Tcl 8.5)
+ * generic/tclHash.c
+ * generic/tclVar.c
+
2011-08-30 Jan Nijtmans <nijtmans@users.sf.net>
* unix/tcl.m4: Make SHLIB_LD_LIBS='${LIBS}' the default and
diff --git a/generic/tcl.decls b/generic/tcl.decls
index c89c0da..4ebaea5 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -951,7 +951,7 @@ declare 268 generic {
void Tcl_AppendStringsToObjVA(Tcl_Obj *objPtr, va_list argList)
}
declare 269 generic {
- CONST84_RETURN char * Tcl_HashStats(Tcl_HashTable *tablePtr)
+ char *Tcl_HashStats(Tcl_HashTable *tablePtr)
}
declare 270 generic {
CONST84_RETURN char * Tcl_ParseVar(Tcl_Interp *interp, CONST char *str,
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 6f59b81..94e8c75 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -883,8 +883,7 @@ EXTERN void Tcl_AppendResultVA _ANSI_ARGS_((Tcl_Interp * interp,
EXTERN void Tcl_AppendStringsToObjVA _ANSI_ARGS_((
Tcl_Obj * objPtr, va_list argList));
/* 269 */
-EXTERN CONST84_RETURN char * Tcl_HashStats _ANSI_ARGS_((
- Tcl_HashTable * tablePtr));
+EXTERN char * Tcl_HashStats _ANSI_ARGS_((Tcl_HashTable * tablePtr));
/* 270 */
EXTERN CONST84_RETURN char * Tcl_ParseVar _ANSI_ARGS_((Tcl_Interp * interp,
CONST char * str, CONST84 char ** termPtr));
@@ -1976,7 +1975,7 @@ typedef struct TclStubs {
void (*tcl_ValidateAllMemory) _ANSI_ARGS_((CONST char * file, int line)); /* 266 */
void (*tcl_AppendResultVA) _ANSI_ARGS_((Tcl_Interp * interp, va_list argList)); /* 267 */
void (*tcl_AppendStringsToObjVA) _ANSI_ARGS_((Tcl_Obj * objPtr, va_list argList)); /* 268 */
- CONST84_RETURN char * (*tcl_HashStats) _ANSI_ARGS_((Tcl_HashTable * tablePtr)); /* 269 */
+ char * (*tcl_HashStats) _ANSI_ARGS_((Tcl_HashTable * tablePtr)); /* 269 */
CONST84_RETURN char * (*tcl_ParseVar) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, CONST84 char ** termPtr)); /* 270 */
CONST84_RETURN char * (*tcl_PkgPresent) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, CONST char * version, int exact)); /* 271 */
CONST84_RETURN char * (*tcl_PkgPresentEx) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name, CONST char * version, int exact, ClientData * clientDataPtr)); /* 272 */
diff --git a/generic/tclHash.c b/generic/tclHash.c
index e7ee344..3eaf395 100644
--- a/generic/tclHash.c
+++ b/generic/tclHash.c
@@ -765,7 +765,7 @@ Tcl_NextHashEntry(searchPtr)
*----------------------------------------------------------------------
*/
-CONST char *
+char *
Tcl_HashStats(tablePtr)
Tcl_HashTable *tablePtr; /* Table for which to produce stats. */
{
diff --git a/generic/tclVar.c b/generic/tclVar.c
index a434bae..c029877 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -3339,7 +3339,7 @@ Tcl_ArrayObjCmd(dummy, interp, objc, objv)
}
case ARRAY_STATISTICS: {
- CONST char *stats;
+ char *stats;
if (notArray) {
goto error;