From e24fc30ca4c6a8cae00961db858816f32aad02d4 Mon Sep 17 00:00:00 2001 From: redman Date: Tue, 10 Aug 1999 22:42:33 +0000 Subject: Removed patch to change prototype of Tcl_ListObjGetElements. --- ChangeLog | 7 ------- generic/tcl.decls | 4 ++-- generic/tclDecls.h | 6 +++--- generic/tclListObj.c | 4 ++-- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9f674b..a02e276 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,13 +7,6 @@ * win/README.binary: * win/configure.in: Changed version number to 8.2b3. - * generic/tclListObj.c: - * generic/tcl.decls: - * generic/tclDecls.h: Applied patch from Jim Ingham to change the - prototype of Tcl_ListObjGetElements to have the last argument have - a CONST so that you can feed it the objv that you get from the - standard TclObj command proc. - * generic/tclAlloc.c: * generic/tclCmdIL.c: * generic/tclIO.c: diff --git a/generic/tcl.decls b/generic/tcl.decls index 0ba69a9..5ff4883 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -10,7 +10,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tcl.decls,v 1.26 1999/08/10 17:35:17 redman Exp $ +# RCS: @(#) $Id: tcl.decls,v 1.26.2.1 1999/08/10 22:42:45 redman Exp $ library tcl @@ -181,7 +181,7 @@ declare 44 generic { } declare 45 generic { int Tcl_ListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr, \ - int *objcPtr, Tcl_Obj * CONST **objvPtr) + int *objcPtr, Tcl_Obj ***objvPtr) } declare 46 generic { int Tcl_ListObjIndex(Tcl_Interp *interp, Tcl_Obj *listPtr, int index, \ diff --git a/generic/tclDecls.h b/generic/tclDecls.h index ad44e96..bf712c5 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclDecls.h,v 1.27 1999/08/10 17:35:18 redman Exp $ + * RCS: @(#) $Id: tclDecls.h,v 1.27.2.1 1999/08/10 22:42:45 redman Exp $ */ #ifndef _TCLDECLS @@ -164,7 +164,7 @@ EXTERN int Tcl_ListObjAppendElement _ANSI_ARGS_(( /* 45 */ EXTERN int Tcl_ListObjGetElements _ANSI_ARGS_(( Tcl_Interp * interp, Tcl_Obj * listPtr, - int * objcPtr, Tcl_Obj * CONST ** objvPtr)); + int * objcPtr, Tcl_Obj *** objvPtr)); /* 46 */ EXTERN int Tcl_ListObjIndex _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, int index, @@ -1284,7 +1284,7 @@ typedef struct TclStubs { void (*tcl_InvalidateStringRep) _ANSI_ARGS_((Tcl_Obj * objPtr)); /* 42 */ int (*tcl_ListObjAppendList) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, Tcl_Obj * elemListPtr)); /* 43 */ int (*tcl_ListObjAppendElement) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, Tcl_Obj * objPtr)); /* 44 */ - int (*tcl_ListObjGetElements) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, int * objcPtr, Tcl_Obj * CONST ** objvPtr)); /* 45 */ + int (*tcl_ListObjGetElements) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, int * objcPtr, Tcl_Obj *** objvPtr)); /* 45 */ int (*tcl_ListObjIndex) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, int index, Tcl_Obj ** objPtrPtr)); /* 46 */ int (*tcl_ListObjLength) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, int * intPtr)); /* 47 */ int (*tcl_ListObjReplace) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, int first, int count, int objc, Tcl_Obj *CONST objv[])); /* 48 */ diff --git a/generic/tclListObj.c b/generic/tclListObj.c index 7b00f6c..99281b2 100644 --- a/generic/tclListObj.c +++ b/generic/tclListObj.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclListObj.c,v 1.6 1999/08/10 17:35:19 redman Exp $ + * RCS: @(#) $Id: tclListObj.c,v 1.6.2.1 1999/08/10 22:42:46 redman Exp $ */ #include "tclInt.h" @@ -305,7 +305,7 @@ Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) * is to be returned. */ int *objcPtr; /* Where to store the count of objects * referenced by objv. */ - Tcl_Obj * CONST **objvPtr; /* Where to store the pointer to an array + Tcl_Obj ***objvPtr; /* Where to store the pointer to an array * of pointers to the list's objects. */ { register List *listRepPtr; -- cgit v0.12