Get rid of pre-C89-isms (esp. CONST vs const).

1 files changed, 16 insertions, 16 deletions

diff --git a/generic/tkGet.c b/generic/tkGet.c
index e6b19e2..807f9c2 100644
--- a/generic/tkGet.c
+++ b/generic/tkGet.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkGet.c,v 1.13 2007/12/13 15:24:14 dgp Exp $
+ * RCS: @(#) $Id: tkGet.c,v 1.14 2008/04/27 22:38:56 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -37,10 +37,10 @@ static void		FreeUidThreadExitProc(ClientData clientData);
  * used by Tk_GetAnchorFromObj and Tk_GetJustifyFromObj.
  */
 
-static CONST char *anchorStrings[] = {
+static const char *anchorStrings[] = {
     "n", "ne", "e", "se", "s", "sw", "w", "nw", "center", NULL
 };
-static CONST char *justifyStrings[] = {
+static const char *justifyStrings[] = {
     "left", "right", "center", NULL
 };
 
@@ -103,7 +103,7 @@ Tk_GetAnchorFromObj(
 int
 Tk_GetAnchor(
     Tcl_Interp *interp,		/* Use this for error reporting. */
-    CONST char *string,		/* String describing a direction. */
+    const char *string,		/* String describing a direction. */
     Tk_Anchor *anchorPtr)	/* Where to store Tk_Anchor corresponding to
 				 * string. */
 {
@@ -175,7 +175,7 @@ Tk_GetAnchor(
  *--------------------------------------------------------------
  */
 
-CONST char *
+const char *
 Tk_NameOfAnchor(
     Tk_Anchor anchor)		/* Anchor for which identifying string is
 				 * desired. */
@@ -216,7 +216,7 @@ Tk_NameOfAnchor(
 int
 Tk_GetJoinStyle(
     Tcl_Interp *interp,		/* Use this for error reporting. */
-    CONST char *string,		/* String describing a justification style. */
+    const char *string,		/* String describing a justification style. */
     int *joinPtr)		/* Where to store join style corresponding to
 				 * string. */
 {
@@ -260,7 +260,7 @@ Tk_GetJoinStyle(
  *--------------------------------------------------------------
  */
 
-CONST char *
+const char *
 Tk_NameOfJoinStyle(
     int join)			/* Join style for which identifying string is
 				 * desired. */
@@ -295,7 +295,7 @@ Tk_NameOfJoinStyle(
 int
 Tk_GetCapStyle(
     Tcl_Interp *interp,		/* Use this for error reporting. */
-    CONST char *string,		/* String describing a justification style. */
+    const char *string,		/* String describing a justification style. */
     int *capPtr)		/* Where to store cap style corresponding to
 				 * string. */
 {
@@ -339,7 +339,7 @@ Tk_GetCapStyle(
  *--------------------------------------------------------------
  */
 
-CONST char *
+const char *
 Tk_NameOfCapStyle(
     int cap)			/* Cap style for which identifying string is
 				 * desired. */
@@ -411,7 +411,7 @@ Tk_GetJustifyFromObj(
 int
 Tk_GetJustify(
     Tcl_Interp *interp,		/* Use this for error reporting. */
-    CONST char *string,		/* String describing a justification style. */
+    const char *string,		/* String describing a justification style. */
     Tk_Justify *justifyPtr)	/* Where to store Tk_Justify corresponding to
 				 * string. */
 {
@@ -456,7 +456,7 @@ Tk_GetJustify(
  *--------------------------------------------------------------
  */
 
-CONST char *
+const char *
 Tk_NameOfJustify(
     Tk_Justify justify)		/* Justification style for which identifying
 				 * string is desired. */
@@ -491,6 +491,7 @@ FreeUidThreadExitProc(
 {
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
             Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+
     Tcl_DeleteHashTable(&tsdPtr->uidTable);
     tsdPtr->initialized = 0;
 }
@@ -519,7 +520,7 @@ FreeUidThreadExitProc(
 
 Tk_Uid
 Tk_GetUid(
-    CONST char *string)		/* String to convert. */
+    const char *string)		/* String to convert. */
 {
     int dummy;
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
@@ -561,7 +562,7 @@ Tk_GetScreenMM(
     Tk_Window tkwin,		/* Window whose screen determines conversion
 				 * from centimeters and other absolute
 				 * units. */
-    CONST char *string,		/* String describing a screen distance. */
+    const char *string,		/* String describing a screen distance. */
     double *doublePtr)		/* Place to store converted result. */
 {
     char *end;
@@ -635,7 +636,7 @@ Tk_GetPixels(
     Tk_Window tkwin,		/* Window whose screen determines conversion
 				 * from centimeters and other absolute
 				 * units. */
-    CONST char *string,		/* String describing a number of pixels. */
+    const char *string,		/* String describing a number of pixels. */
     int *intPtr)		/* Place to store converted result. */
 {
     double d;
@@ -660,7 +661,6 @@ Tk_GetPixels(
  *	string.
  *
  * Results:
-
  *	The return value is a standard Tcl return result. If TCL_OK is
  *	returned, then everything went well and the pixel distance is stored
  *	at *doublePtr; otherwise TCL_ERROR is returned and an error message is
@@ -678,7 +678,7 @@ TkGetDoublePixels(
     Tk_Window tkwin,		/* Window whose screen determines conversion
 				 * from centimeters and other absolute
 				 * units. */
-    CONST char *string,		/* String describing a number of pixels. */
+    const char *string,		/* String describing a number of pixels. */
     double *doublePtr)		/* Place to store converted result. */
 {
     char *end;