Use @EXEEXT@ in stead of @EXT_SUFFIX@

Use -DBUILD_tk in Makefile
Make internal Tk_ObjCustomOption const

4 files changed, 12 insertions, 12 deletions

diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index d220423..8669b1b 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkConfig.c,v 1.32 2009/12/15 18:12:07 dgp Exp $
+ * RCS: @(#) $Id: tkConfig.c,v 1.33 2010/02/22 23:38:53 nijtmans Exp $
  */
 
 /*
@@ -65,7 +65,7 @@ typedef struct TkOption {
 	struct TkOption *synonymPtr;
 				/* For synonym options, this points to the
 				 * master entry. */
-	struct Tk_ObjCustomOption *custom;
+	const struct Tk_ObjCustomOption *custom;
 				/* For TK_OPTION_CUSTOM. */
     } extra;
     int flags;			/* Miscellaneous flag values; see below for
@@ -940,7 +940,7 @@ DoObjConfig(
 	break;
     }
     case TK_OPTION_CUSTOM: {
-	Tk_ObjCustomOption *custom = optionPtr->extra.custom;
+	const Tk_ObjCustomOption *custom = optionPtr->extra.custom;
 
 	if (custom->setProc(custom->clientData, interp, tkwin,
 		&valuePtr, recordPtr, optionPtr->specPtr->internalOffset,
@@ -1530,7 +1530,7 @@ Tk_RestoreSavedOptions(
 		*((Tk_Window *) internalPtr) = *((Tk_Window *) ptr);
 		break;
 	    case TK_OPTION_CUSTOM: {
-		Tk_ObjCustomOption *custom = optionPtr->extra.custom;
+		const Tk_ObjCustomOption *custom = optionPtr->extra.custom;
 
 		if (custom->restoreProc != NULL) {
 		    custom->restoreProc(custom->clientData, savePtr->tkwin,
@@ -1755,7 +1755,7 @@ FreeResources(
 	}
 	break;
     case TK_OPTION_CUSTOM: {
-	Tk_ObjCustomOption *custom = optionPtr->extra.custom;
+	const Tk_ObjCustomOption *custom = optionPtr->extra.custom;
 	if (internalFormExists && custom->freeProc != NULL) {
 	    custom->freeProc(custom->clientData, tkwin, internalPtr);
 	}
@@ -2046,7 +2046,7 @@ GetObjectForOption(
 	break;
     }
     case TK_OPTION_CUSTOM: {
-	Tk_ObjCustomOption *custom = optionPtr->extra.custom;
+	const Tk_ObjCustomOption *custom = optionPtr->extra.custom;
 
 	objPtr = custom->getProc(custom->clientData, tkwin, recordPtr,
 		optionPtr->specPtr->internalOffset);
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index adf2f2b..3df5024 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.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: tkPanedWindow.c,v 1.41 2010/02/13 13:47:49 nijtmans Exp $
+ * RCS: @(#) $Id: tkPanedWindow.c,v 1.42 2010/02/22 23:38:53 nijtmans Exp $
  */
 
 #include "default.h"
@@ -260,7 +260,7 @@ static const Tk_GeomMgr panedWindowMgrType = {
  * the custom "-sticky" option for slave windows.
  */
 
-static Tk_ObjCustomOption stickyOption = {
+static const Tk_ObjCustomOption stickyOption = {
     "sticky",			/* name */
     SetSticky,			/* setProc */
     GetSticky,			/* getProc */
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 511024e..04cc8e8 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -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: tkTest.c,v 1.46 2010/02/21 12:14:16 dkf Exp $
+ * RCS: @(#) $Id: tkTest.c,v 1.47 2010/02/22 23:38:53 nijtmans Exp $
  */
 
 #undef STATIC_BUILD
@@ -633,7 +633,7 @@ TestobjconfigObjCmd(
 				/* Holds pointers to option tables created by
 				 * commands below; indexed with same values as
 				 * "options" array. */
-    static Tk_ObjCustomOption CustomOption = {
+    static const Tk_ObjCustomOption CustomOption = {
 	"custom option",
 	CustomOptionSet,
 	CustomOptionGet,
diff --git a/generic/tkText.c b/generic/tkText.c
index d6e232a..650e77b 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -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: tkText.c,v 1.96 2010/02/21 12:11:13 dkf Exp $
+ * RCS: @(#) $Id: tkText.c,v 1.97 2010/02/22 23:38:53 nijtmans Exp $
  */
 
 #include "default.h"
@@ -108,7 +108,7 @@ static void		RestoreLineStartEnd(ClientData clientData,
 			    char *oldInternalPtr);
 static int		ObjectIsEmpty(Tcl_Obj *objPtr);
 
-static Tk_ObjCustomOption lineOption = {
+static const Tk_ObjCustomOption lineOption = {
     "line",			/* name */
     SetLineStartEnd,		/* setProc */
     GetLineStartEnd,		/* getProc */