Index: generic/tkButton.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkButton.c,v
retrieving revision 1.18
diff -u -r1.18 tkButton.c
--- generic/tkButton.c	17 Jun 2002 10:54:29 -0000	1.18
+++ generic/tkButton.c	24 Jul 2002 02:54:08 -0000
@@ -524,11 +524,11 @@
 			    ClientData clientData, int x, int y, int width,
 			    int height, int imgWidth, int imgHeight));
 static char *		ButtonTextVarProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, CONST char *name2,
-			    int flags));
+			    Tcl_Interp *interp, CONST char *name1,
+			    CONST char *name2, int flags));
 static char *		ButtonVarProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, CONST char *name2,
-			    int flags));
+			    Tcl_Interp *interp, CONST char *name1,
+			    CONST char *name2, int flags));
 static int		ButtonWidgetObjCmd _ANSI_ARGS_((ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *CONST objv[]));
@@ -1552,7 +1552,7 @@
 ButtonVarProc(clientData, interp, name1, name2, flags)
     ClientData clientData;	/* Information about button. */
     Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Name of variable. */
+    CONST char *name1;		/* Name of variable. */
     CONST char *name2;		/* Second part of variable name. */
     int flags;			/* Information about what happened. */
 {
@@ -1631,7 +1631,7 @@
 ButtonTextVarProc(clientData, interp, name1, name2, flags)
     ClientData clientData;	/* Information about button. */
     Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Not used. */
+    CONST char *name1;		/* Not used. */
     CONST char *name2;		/* Not used. */
     int flags;			/* Information about what happened. */
 {
Index: generic/tkCmds.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkCmds.c,v
retrieving revision 1.28
diff -u -r1.28 tkCmds.c
--- generic/tkCmds.c	17 Jun 2002 20:09:01 -0000	1.28
+++ generic/tkCmds.c	24 Jul 2002 02:54:08 -0000
@@ -32,8 +32,8 @@
 
 static TkWindow *	GetToplevel _ANSI_ARGS_((Tk_Window tkwin));
 static char *		WaitVariableProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, CONST char *name2,
-			    int flags));
+			    Tcl_Interp *interp, CONST char *name1,
+			    CONST char *name2, int flags));
 static void		WaitVisibilityProc _ANSI_ARGS_((ClientData clientData,
 			    XEvent *eventPtr));
 static void		WaitWindowProc _ANSI_ARGS_((ClientData clientData,
@@ -939,7 +939,7 @@
 WaitVariableProc(clientData, interp, name1, name2, flags)
     ClientData clientData;	/* Pointer to integer to set to 1. */
     Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Name of variable. */
+    CONST char *name1;		/* Name of variable. */
     CONST char *name2;		/* Second part of variable name. */
     int flags;			/* Information about what happened. */
 {
Index: generic/tkConsole.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkConsole.c,v
retrieving revision 1.17
diff -u -r1.17 tkConsole.c
--- generic/tkConsole.c	12 Apr 2002 06:51:50 -0000	1.17
+++ generic/tkConsole.c	24 Jul 2002 02:54:08 -0000
@@ -13,6 +13,7 @@
  * RCS: @(#) $Id: tkConsole.c,v 1.17 2002/04/12 06:51:50 hobbs Exp $
  */
 
+#define USE_COMPAT_CONST
 #include "tk.h"
 #include <string.h>
 
@@ -58,7 +59,7 @@
 static int	ConsoleInput _ANSI_ARGS_((ClientData instanceData,
 		    char *buf, int toRead, int *errorCode));
 static int	ConsoleOutput _ANSI_ARGS_((ClientData instanceData,
-		    CONST char *buf, int toWrite, int *errorCode));
+		    char *buf, int toWrite, int *errorCode));
 static int	ConsoleClose _ANSI_ARGS_((ClientData instanceData,
 		    Tcl_Interp *interp));
 static void	ConsoleWatch _ANSI_ARGS_((ClientData instanceData,
@@ -405,7 +406,7 @@
 static int
 ConsoleOutput(instanceData, buf, toWrite, errorCode)
     ClientData instanceData;		/* Indicates which device to use. */
-    CONST char *buf;			/* The data buffer. */
+    char *buf;			/* The data buffer. */
     int toWrite;			/* How many bytes to write? */
     int *errorCode;			/* Where to store error code. */
 {
Index: generic/tkEntry.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkEntry.c,v
retrieving revision 1.28
diff -u -r1.28 tkEntry.c
--- generic/tkEntry.c	5 Apr 2002 08:43:22 -0000	1.28
+++ generic/tkEntry.c	24 Jul 2002 02:54:09 -0000
@@ -694,8 +694,8 @@
 static void		EntrySelectTo _ANSI_ARGS_((
 			    Entry *entryPtr, int index));
 static char *		EntryTextVarProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, CONST char *name2,
-			    int flags));
+			    Tcl_Interp *interp, CONST char *name1,
+			    CONST char *name2, int flags));
 static void		EntryUpdateScrollbar _ANSI_ARGS_((Entry *entryPtr));
 static int		EntryValidate _ANSI_ARGS_((Entry *entryPtr,
 			    char *cmd));
@@ -3279,7 +3279,7 @@
 EntryTextVarProc(clientData, interp, name1, name2, flags)
     ClientData clientData;	/* Information about button. */
     Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Not used. */
+    CONST char *name1;		/* Not used. */
     CONST char *name2;		/* Not used. */
     int flags;			/* Information about what happened. */
 {
Index: generic/tkInt.decls
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkInt.decls,v
retrieving revision 1.28
diff -u -r1.28 tkInt.decls
--- generic/tkInt.decls	18 Jun 2002 23:51:46 -0000	1.28
+++ generic/tkInt.decls	24 Jul 2002 02:54:09 -0000
@@ -178,7 +178,7 @@
 }
 
 declare 33 generic {
-    CONST char * TkGetDefaultScreenName (Tcl_Interp *interp, \
+    CONST84_RETURN char * TkGetDefaultScreenName (Tcl_Interp *interp, \
 	    CONST char *screenName)
 }
 
Index: generic/tkListbox.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkListbox.c,v
retrieving revision 1.27
diff -u -r1.27 tkListbox.c
--- generic/tkListbox.c	21 Jun 2002 02:38:54 -0000	1.27
+++ generic/tkListbox.c	24 Jul 2002 02:54:09 -0000
@@ -442,8 +442,8 @@
 static int		NearestListboxElement _ANSI_ARGS_((Listbox *listPtr,
 			    int y));
 static char *		ListboxListVarProc _ANSI_ARGS_ ((ClientData clientData,
-	                    Tcl_Interp *interp, char *name1, CONST char *name2,
- 	                    int flags));
+	                    Tcl_Interp *interp, CONST char *name1,
+			    CONST char *name2, int flags));
 static void		MigrateHashEntries _ANSI_ARGS_ ((Tcl_HashTable *table,
 			    int first, int last, int offset));
 /*
@@ -3303,7 +3303,7 @@
 ListboxListVarProc(clientData, interp, name1, name2, flags)
     ClientData clientData;      /* Information about button. */
     Tcl_Interp *interp;         /* Interpreter containing variable. */
-    char *name1;                /* Not used. */
+    CONST char *name1;          /* Not used. */
     CONST char *name2;          /* Not used. */
     int flags;                  /* Information about what happened. */
 {
Index: generic/tkMenu.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkMenu.c,v
retrieving revision 1.18
diff -u -r1.18 tkMenu.c
--- generic/tkMenu.c	12 Apr 2002 07:28:06 -0000	1.18
+++ generic/tkMenu.c	24 Jul 2002 02:54:09 -0000
@@ -360,8 +360,8 @@
 static TkMenuEntry *	MenuNewEntry _ANSI_ARGS_((TkMenu *menuPtr, int index,
 			    int type));
 static char *		MenuVarProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, CONST char *name2,
-			    int flags));
+			    Tcl_Interp *interp, CONST char *name1,
+			    CONST char *name2, int flags));
 static int		MenuWidgetObjCmd _ANSI_ARGS_((ClientData clientData,
 			    Tcl_Interp *interp, int objc, 
 			    Tcl_Obj *CONST objv[]));
@@ -2468,7 +2468,7 @@
 MenuVarProc(clientData, interp, name1, name2, flags)
     ClientData clientData;	/* Information about menu entry. */
     Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* First part of variable's name. */
+    CONST char *name1;		/* First part of variable's name. */
     CONST char *name2;		/* Second part of variable's name. */
     int flags;			/* Describes what just happened. */
 {
Index: generic/tkMenubutton.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkMenubutton.c,v
retrieving revision 1.11
diff -u -r1.11 tkMenubutton.c
--- generic/tkMenubutton.c	20 Mar 2002 22:55:16 -0000	1.11
+++ generic/tkMenubutton.c	24 Jul 2002 02:54:09 -0000
@@ -176,7 +176,7 @@
 			    int imgHeight));
 static char *		MenuButtonTextVarProc _ANSI_ARGS_((
 			    ClientData clientData, Tcl_Interp *interp,
-			    char *name1, CONST char *name2, int flags));
+			    CONST char *name1, CONST char *name2, int flags));
 static int		MenuButtonWidgetObjCmd _ANSI_ARGS_((
                             ClientData clientData, Tcl_Interp *interp, 
 			    int objc, Tcl_Obj *CONST objv[]));
@@ -867,7 +867,7 @@
 MenuButtonTextVarProc(clientData, interp, name1, name2, flags)
     ClientData clientData;	/* Information about button. */
     Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Name of variable. */
+    CONST char *name1;		/* Name of variable. */
     CONST char *name2;		/* Second part of variable name. */
     int flags;			/* Information about what happened. */
 {
Index: generic/tkMessage.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkMessage.c,v
retrieving revision 1.13
diff -u -r1.13 tkMessage.c
--- generic/tkMessage.c	20 Mar 2002 22:55:16 -0000	1.13
+++ generic/tkMessage.c	24 Jul 2002 02:54:09 -0000
@@ -176,8 +176,8 @@
 static void		MessageEventProc _ANSI_ARGS_((ClientData clientData,
 			    XEvent *eventPtr));
 static char *		MessageTextVarProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, CONST char *name2,
-			    int flags));
+			    Tcl_Interp *interp, CONST char *name1,
+			    CONST char *name2, int flags));
 static int		MessageWidgetObjCmd _ANSI_ARGS_((ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 	                    Tcl_Obj *CONST objv[]));
@@ -847,7 +847,7 @@
 MessageTextVarProc(clientData, interp, name1, name2, flags)
     ClientData clientData;	/* Information about message. */
     Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Name of variable. */
+    CONST char *name1;		/* Name of variable. */
     CONST char *name2;		/* Second part of variable name. */
     int flags;			/* Information about what happened. */
 {
Index: generic/tkScale.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkScale.c,v
retrieving revision 1.16
diff -u -r1.16 tkScale.c
--- generic/tkScale.c	20 Mar 2002 22:55:16 -0000	1.16
+++ generic/tkScale.c	24 Jul 2002 02:54:09 -0000
@@ -171,8 +171,8 @@
 static void		ScaleEventProc _ANSI_ARGS_((ClientData clientData,
 			    XEvent *eventPtr));
 static char *		ScaleVarProc _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, char *name1, CONST char *name2,
-			    int flags));
+			    Tcl_Interp *interp, CONST char *name1,
+			    CONST char *name2, int flags));
 static int		ScaleWidgetObjCmd _ANSI_ARGS_((ClientData clientData,
 			    Tcl_Interp *interp, int objc, 
 			    Tcl_Obj *CONST objv[]));
@@ -1185,7 +1185,7 @@
 ScaleVarProc(clientData, interp, name1, name2, flags)
     ClientData clientData;	/* Information about button. */
     Tcl_Interp *interp;		/* Interpreter containing variable. */
-    char *name1;		/* Name of variable. */
+    CONST char *name1;		/* Name of variable. */
     CONST char *name2;		/* Second part of variable name. */
     int flags;			/* Information about what happened. */
 {
Index: generic/tkScrollbar.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkScrollbar.c,v
retrieving revision 1.5
diff -u -r1.5 tkScrollbar.c
--- generic/tkScrollbar.c	22 Nov 2000 01:49:38 -0000	1.5
+++ generic/tkScrollbar.c	24 Jul 2002 02:54:09 -0000
@@ -15,6 +15,7 @@
  * RCS: @(#) $Id: tkScrollbar.c,v 1.5 2000/11/22 01:49:38 ericm Exp $
  */
 
+#define USE_COMPAT_CONST
 #include "tkPort.h"
 #include "tkScrollbar.h"
 #include "default.h"
Index: generic/tkTest.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkTest.c,v
retrieving revision 1.18
diff -u -r1.18 tkTest.c
--- generic/tkTest.c	15 Jul 2002 16:56:32 -0000	1.18
+++ generic/tkTest.c	24 Jul 2002 02:54:10 -0000
@@ -16,6 +16,7 @@
  * RCS: @(#) $Id: tkTest.c,v 1.18 2002/07/15 16:56:32 dgp Exp $
  */
 
+#define USE_COMPAT_CONST
 #include "tkInt.h"
 #include "tkPort.h"
 #include "tkText.h"
@@ -628,7 +629,7 @@
     int objc;			/* Number of arguments. */
     Tcl_Obj *CONST objv[];	/* Argument objects. */
 {
-    static CONST char *options[] = {"alltypes", "chain1", "chain2",
+    static char *options[] = {"alltypes", "chain1", "chain2",
 	    "configerror", "delete", "info", "internal", "new",
 	    "notenoughparams", "twowindows", (char *) NULL};
     enum {
@@ -1351,7 +1352,7 @@
     Tcl_Obj *CONST objv[];	/* Argument objects. */
 {
     int result = TCL_OK;
-    static CONST char *options[] = {
+    static char *options[] = {
 	"cget", "configure", "csave", (char *) NULL
     };
     enum {
@@ -1537,7 +1538,7 @@
     int objc;			/* Number of arguments. */
     Tcl_Obj *CONST objv[];	/* Argument objects. */
 {
-    static CONST char *options[] = {"counts", "subfonts", (char *) NULL};
+    static char *options[] = {"counts", "subfonts", (char *) NULL};
     enum option {COUNTS, SUBFONTS};
     int index;
     Tk_Window tkwin;
Index: generic/tkText.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkText.c,v
retrieving revision 1.28
diff -u -r1.28 tkText.c
--- generic/tkText.c	22 Jun 2002 08:21:51 -0000	1.28
+++ generic/tkText.c	24 Jul 2002 02:54:10 -0000
@@ -17,6 +17,7 @@
  * RCS: @(#) $Id: tkText.c,v 1.28 2002/06/22 08:21:51 hobbs Exp $
  */
 
+#define USE_COMPAT_CONST
 #include "default.h"
 #include "tkPort.h"
 #include "tkInt.h"
@@ -802,7 +803,7 @@
     } else if ((c == 'i') && (strncmp(argv[1], "insert", length) == 0)
 	    && (length >= 3)) {
 	int i, j, numTags;
-	CONST char **tagNames;
+	char **tagNames;
 	TkTextTag **oldTagArrayPtr;
 
 	if (argc < 4) {
@@ -2225,7 +2226,7 @@
 		i = p - startOfLine;
 		thisLength = patLength;
 	    } else {
-		CONST char *start, *end;
+		char *start, *end;
 		int match;
 
 		match = Tcl_RegExpExec(interp, regexp,
@@ -2386,7 +2387,7 @@
 					 * the text manual entry for details. */
 {
     int argc, i, count, c;
-    CONST char **argv;
+    char **argv;
     TkTextTabArray *tabArrayPtr;
     TkTextTab *tabPtr;
     Tcl_UniChar ch;
@@ -2719,7 +2720,7 @@
 	Tcl_AppendElement(interp, buffer);
 	return TCL_OK;
     } else {
-	CONST char *argv[4];
+	char *argv[4];
 	char *list;
 	int result;
 	argv[0] = key;
Index: generic/tkWindow.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkWindow.c,v
retrieving revision 1.50
diff -u -r1.50 tkWindow.c
--- generic/tkWindow.c	19 Jun 2002 19:37:54 -0000	1.50
+++ generic/tkWindow.c	24 Jul 2002 02:54:10 -0000
@@ -15,6 +15,7 @@
  * RCS: @(#) $Id: tkWindow.c,v 1.50 2002/06/19 19:37:54 mdejong Exp $
  */
 
+#define USE_COMPAT_CONST
 #include "tkPort.h"
 #include "tkInt.h"
 
@@ -2795,7 +2796,7 @@
 {
     char *p;
     int argc, code;
-    CONST char **argv; 
+    char **argv; 
     char *args[20];
     CONST char *argString = NULL;
     Tcl_DString class;
Index: unix/tkUnixSend.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/unix/tkUnixSend.c,v
retrieving revision 1.9
diff -u -r1.9 tkUnixSend.c
--- unix/tkUnixSend.c	18 Jul 2002 16:02:48 -0000	1.9
+++ unix/tkUnixSend.c	24 Jul 2002 02:54:10 -0000
@@ -15,6 +15,7 @@
  * RCS: @(#) $Id: tkUnixSend.c,v 1.9 2002/07/18 16:02:48 rmax Exp $
  */
 
+#define USE_COMPAT_CONST
 #include "tkPort.h"
 #include "tkInt.h"
 #include "tkUnixInt.h"
@@ -603,7 +604,7 @@
     Atom actualType;
     char *property;
     Tk_ErrorHandler handler;
-    CONST char **argv;
+    char **argv;
 
     property = NULL;
 
