From 1d327cff35030c574230508e600a5f587b64b321 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Thu, 3 May 2007 21:53:12 +0000
Subject: Missed a place (or rather not all versions of GCC catch it.)

---
 ChangeLog          |  1 +
 generic/tkConfig.c | 57 ++++++++++++++++++++----------------------------------
 2 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ec21526..fe8a588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2007-05-03  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
+	* generic/tkConfig.c (Tk_RestoreSavedOptions): 
 	* generic/tkCanvPs.c (TkCanvPostscriptCmd): 
 	* generic/tkOption.c (GetDefaultOptions): 
 	* unix/tkUnixRFont.c (TkpGetFontAttrsForChar, InitFont) 
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index 8745183..614d244 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.23 2007/02/12 21:53:06 dkf Exp $
+ * RCS: @(#) $Id: tkConfig.c,v 1.24 2007/05/03 21:53:13 dkf Exp $
  */
 
 /*
@@ -1435,79 +1435,64 @@ Tk_RestoreSavedOptions(
 		    = savePtr->items[i].valuePtr;
 	}
 	if (specPtr->internalOffset >= 0) {
+	    register char *ptr = (char *) &savePtr->items[i].internalForm;
+
 	    switch (specPtr->type) {
 	    case TK_OPTION_BOOLEAN:
-		*((int *) internalPtr) =
-			*((int *) &savePtr->items[i].internalForm);
+		*((int *) internalPtr) = *((int *) ptr);
 		break;
 	    case TK_OPTION_INT:
-		*((int *) internalPtr) =
-			*((int *) &savePtr->items[i].internalForm);
+		*((int *) internalPtr) = *((int *) ptr);
 		break;
 	    case TK_OPTION_DOUBLE:
-		*((double *) internalPtr) =
-			*((double *) &savePtr->items[i].internalForm);
+		*((double *) internalPtr) = *((double *) ptr);
 		break;
 	    case TK_OPTION_STRING:
-		*((char **) internalPtr) =
-			*((char **) &savePtr->items[i].internalForm);
+		*((char **) internalPtr) = *((char **) ptr);
 		break;
 	    case TK_OPTION_STRING_TABLE:
-		*((int *) internalPtr) =
-			*((int *) &savePtr->items[i].internalForm);
+		*((int *) internalPtr) = *((int *) ptr);
 		break;
 	    case TK_OPTION_COLOR:
-		*((XColor **) internalPtr) =
-			*((XColor **) &savePtr->items[i].internalForm);
+		*((XColor **) internalPtr) = *((XColor **) ptr);
 		break;
 	    case TK_OPTION_FONT:
-		*((Tk_Font *) internalPtr) =
-			*((Tk_Font *) &savePtr->items[i].internalForm);
+		*((Tk_Font *) internalPtr) = *((Tk_Font *) ptr);
 		break;
 	    case TK_OPTION_STYLE:
-		*((Tk_Style *) internalPtr) =
-			*((Tk_Style *) &savePtr->items[i].internalForm);
+		*((Tk_Style *) internalPtr) = *((Tk_Style *) ptr);
 		break;
 	    case TK_OPTION_BITMAP:
-		*((Pixmap *) internalPtr) =
-			*((Pixmap *) &savePtr->items[i].internalForm);
+		*((Pixmap *) internalPtr) = *((Pixmap *) ptr);
 		break;
 	    case TK_OPTION_BORDER:
-		*((Tk_3DBorder *) internalPtr) =
-			*((Tk_3DBorder *) &savePtr->items[i].internalForm);
+		*((Tk_3DBorder *) internalPtr) = *((Tk_3DBorder *) ptr);
 		break;
 	    case TK_OPTION_RELIEF:
-		*((int *) internalPtr) =
-			*((int *) &savePtr->items[i].internalForm);
+		*((int *) internalPtr) = *((int *) ptr);
 		break;
 	    case TK_OPTION_CURSOR:
-		*((Tk_Cursor *) internalPtr) =
-			*((Tk_Cursor *) &savePtr->items[i].internalForm);
+		*((Tk_Cursor *) internalPtr) = *((Tk_Cursor *) ptr);
 		Tk_DefineCursor(savePtr->tkwin, *((Tk_Cursor *) internalPtr));
 		break;
 	    case TK_OPTION_JUSTIFY:
-		*((Tk_Justify *) internalPtr) =
-			*((Tk_Justify *) &savePtr->items[i].internalForm);
+		*((Tk_Justify *) internalPtr) = *((Tk_Justify *) ptr);
 		break;
 	    case TK_OPTION_ANCHOR:
-		*((Tk_Anchor *) internalPtr) =
-			*((Tk_Anchor *) &savePtr->items[i].internalForm);
+		*((Tk_Anchor *) internalPtr) = *((Tk_Anchor *) ptr);
 		break;
 	    case TK_OPTION_PIXELS:
-		*((int *) internalPtr) =
-			*((int *) &savePtr->items[i].internalForm);
+		*((int *) internalPtr) = *((int *) ptr);
 		break;
 	    case TK_OPTION_WINDOW:
-		*((Tk_Window *) internalPtr) =
-			*((Tk_Window *) &savePtr->items[i].internalForm);
+		*((Tk_Window *) internalPtr) = *((Tk_Window *) ptr);
 		break;
 	    case TK_OPTION_CUSTOM: {
 		Tk_ObjCustomOption *custom = optionPtr->extra.custom;
 
 		if (custom->restoreProc != NULL) {
-		    custom->restoreProc(custom->clientData,
-			    savePtr->tkwin, internalPtr,
-			    (char *)&savePtr->items[i].internalForm);
+		    custom->restoreProc(custom->clientData, savePtr->tkwin,
+			    internalPtr, ptr);
 		}
 		break;
 	    }
-- 
cgit v0.12