* generic/tcl.decls (Tcl_RegExpRange,Tcl_GetIndexFromObjStruct):

        Overlooked a few source incompatibilities.  Now using CONST84.
        * generic/tclDecls.h: make genstubs
        * generic/tcl.h (Tcl_CmdObjTraceProc): silence warning from Sun
        Workshop compiler.

4 files changed, 21 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index ebbc066..174d19a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-02-20  Don Porter <dgp@users.sourceforge.net>
+
+	* generic/tcl.decls (Tcl_RegExpRange,Tcl_GetIndexFromObjStruct):
+	Overlooked a few source incompatibilities.  Now using CONST84.
+	* generic/tclDecls.h: make genstubs
+	* generic/tcl.h (Tcl_CmdObjTraceProc): silence warning from Sun
+	Workshop compiler.
+
 2002-02-20  David Gravereaux <davygrvy@pobox.com>
 
 	* win/makefile.vc: Added the pentium errata switches to $(cflags)
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 915571e..cc380ae 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -11,7 +11,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.83 2002/02/15 14:28:48 dkf Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.84 2002/02/20 18:46:29 dgp Exp $
 
 library tcl
 
@@ -763,7 +763,7 @@ declare 214 generic {
 }
 declare 215 generic {
     void Tcl_RegExpRange(Tcl_RegExp regexp, int index,
-	    CONST char **startPtr, CONST char **endPtr)
+	    CONST84 char **startPtr, CONST84 char **endPtr)
 }
 declare 216 generic {
     void Tcl_Release(ClientData clientData)
@@ -1086,7 +1086,7 @@ declare 303 generic {
 }
 declare 304 generic {
     int Tcl_GetIndexFromObjStruct(Tcl_Interp *interp, Tcl_Obj *objPtr,
-	    CONST char **tablePtr, int offset, CONST char *msg, int flags,
+	    CONST84 char **tablePtr, int offset, CONST char *msg, int flags,
 	    int *indexPtr)
 }
 declare 305 generic {
diff --git a/generic/tcl.h b/generic/tcl.h
index 160990c..f9246e7 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,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.h,v 1.116 2002/02/20 00:35:47 dkf Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.117 2002/02/20 18:46:29 dgp Exp $
  */
 
 #ifndef _TCL
@@ -665,14 +665,9 @@ typedef int (Tcl_CmdProc) _ANSI_ARGS_((ClientData clientData,
 typedef void (Tcl_CmdTraceProc) _ANSI_ARGS_((ClientData clientData,
 	Tcl_Interp *interp, int level, char *command, Tcl_CmdProc *proc,
 	ClientData cmdClientData, int argc, char *argv[]));
-typedef int (Tcl_CmdObjTraceProc) _ANSI_ARGS_(( 
-    ClientData            clientData,
-    Tcl_Interp*           interp,
-    int                   level,
-    CONST char*           command,
-    Tcl_Command           commandInfo,
-    int                   objc,
-    struct Tcl_Obj *CONST objv[] ));
+typedef int (Tcl_CmdObjTraceProc) _ANSI_ARGS_((ClientData clientData,
+	Tcl_Interp *interp, int level, CONST char *command,
+	Tcl_Command commandInfo, int objc, struct Tcl_Obj * CONST * objv));
 typedef void (Tcl_CmdObjTraceDeleteProc) _ANSI_ARGS_((ClientData clientData));
 typedef void (Tcl_DupInternalRepProc) _ANSI_ARGS_((struct Tcl_Obj *srcPtr, 
         struct Tcl_Obj *dupPtr));
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 316da70..65cc00b 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.83 2002/02/15 14:28:48 dkf Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.84 2002/02/20 18:46:29 dgp Exp $
  */
 
 #ifndef _TCLDECLS
@@ -704,8 +704,8 @@ EXTERN int		Tcl_RegExpMatch _ANSI_ARGS_((Tcl_Interp * interp,
 				CONST char * str, CONST char * pattern));
 /* 215 */
 EXTERN void		Tcl_RegExpRange _ANSI_ARGS_((Tcl_RegExp regexp, 
-				int index, CONST char ** startPtr, 
-				CONST char ** endPtr));
+				int index, CONST84 char ** startPtr, 
+				CONST84 char ** endPtr));
 /* 216 */
 EXTERN void		Tcl_Release _ANSI_ARGS_((ClientData clientData));
 /* 217 */
@@ -987,7 +987,7 @@ EXTERN void		Tcl_GetEncodingNames _ANSI_ARGS_((
 /* 304 */
 EXTERN int		Tcl_GetIndexFromObjStruct _ANSI_ARGS_((
 				Tcl_Interp * interp, Tcl_Obj * objPtr, 
-				CONST char ** tablePtr, int offset, 
+				CONST84 char ** tablePtr, int offset, 
 				CONST char * msg, int flags, int * indexPtr));
 /* 305 */
 EXTERN VOID *		Tcl_GetThreadData _ANSI_ARGS_((
@@ -1827,7 +1827,7 @@ typedef struct TclStubs {
     Tcl_RegExp (*tcl_RegExpCompile) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * string)); /* 212 */
     int (*tcl_RegExpExec) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_RegExp regexp, CONST char * str, CONST char * start)); /* 213 */
     int (*tcl_RegExpMatch) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, CONST char * pattern)); /* 214 */
-    void (*tcl_RegExpRange) _ANSI_ARGS_((Tcl_RegExp regexp, int index, CONST char ** startPtr, CONST char ** endPtr)); /* 215 */
+    void (*tcl_RegExpRange) _ANSI_ARGS_((Tcl_RegExp regexp, int index, CONST84 char ** startPtr, CONST84 char ** endPtr)); /* 215 */
     void (*tcl_Release) _ANSI_ARGS_((ClientData clientData)); /* 216 */
     void (*tcl_ResetResult) _ANSI_ARGS_((Tcl_Interp * interp)); /* 217 */
     int (*tcl_ScanElement) _ANSI_ARGS_((CONST char * str, int * flagPtr)); /* 218 */
@@ -1916,7 +1916,7 @@ typedef struct TclStubs {
     Tcl_Encoding (*tcl_GetEncoding) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * name)); /* 301 */
     CONST char * (*tcl_GetEncodingName) _ANSI_ARGS_((Tcl_Encoding encoding)); /* 302 */
     void (*tcl_GetEncodingNames) _ANSI_ARGS_((Tcl_Interp * interp)); /* 303 */
-    int (*tcl_GetIndexFromObjStruct) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, CONST char ** tablePtr, int offset, CONST char * msg, int flags, int * indexPtr)); /* 304 */
+    int (*tcl_GetIndexFromObjStruct) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objPtr, CONST84 char ** tablePtr, int offset, CONST char * msg, int flags, int * indexPtr)); /* 304 */
     VOID * (*tcl_GetThreadData) _ANSI_ARGS_((Tcl_ThreadDataKey * keyPtr, int size)); /* 305 */
     Tcl_Obj * (*tcl_GetVar2Ex) _ANSI_ARGS_((Tcl_Interp * interp, char * part1, char * part2, int flags)); /* 306 */
     ClientData (*tcl_InitNotifier) _ANSI_ARGS_((void)); /* 307 */