Merge 8.6

1 files changed, 4 insertions, 39 deletions

diff --git a/xlib/xgc.c b/xlib/xgc.c
index b211286..873dcce 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -13,16 +13,8 @@
  */
 
 #include "tkInt.h"
-
-#if !defined(MAC_OSX_TK)
-#   include <X11/Xlib.h>
-#   define TkpInitGCCache(gc)
-#   define TkpFreeGCCache(gc)
-#   define TkpGetGCCache(gc)
-#else
-#   include <tkMacOSXInt.h>
-#   include <X11/Xlib.h>
-#   include <X11/X.h>
+#include <X11/Xlib.h>
+#if defined(MAC_OSX_TK)
 #endif
 
 
@@ -30,10 +22,7 @@
 typedef struct {
     XGCValues gc;
     char dash[MAX_DASH_LIST_SIZE];
-#ifdef MAC_OSX_TK
-    TkpGCCache cache;
-#endif
-} XGCValuesWithCache;
+} XGCValuesWithDash;
 
 /*
  *----------------------------------------------------------------------
@@ -117,7 +106,7 @@ XCreateGC(
      * initialization.
      */
 
-    gp = (GC)ckalloc(sizeof(XGCValuesWithCache));
+    gp = (GC)ckalloc(sizeof(XGCValuesWithDash));
     if (!gp) {
 	return NULL;
     }
@@ -158,32 +147,9 @@ XCreateGC(
 	clip_mask->type = TKP_CLIP_PIXMAP;
 	clip_mask->value.pixmap = values->clip_mask;
     }
-    TkpInitGCCache(gp);
-
     return gp;
 }
 
-#ifdef MAC_OSX_TK
-/*
- *----------------------------------------------------------------------
- *
- * TkpGetGCCache --
- *
- * Results:
- *	Pointer to the TkpGCCache at the end of the GC.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-TkpGCCache*
-TkpGetGCCache(GC gc) {
-    return (gc ? &((XGCValuesWithCache *)gc)->cache : NULL);
-}
-#endif
-
 /*
  *----------------------------------------------------------------------
  *
@@ -265,7 +231,6 @@ int XFreeGC(
 
     if (gc != NULL) {
 	FreeClipMask(gc);
-	TkpFreeGCCache(gc);
 	ckfree(gc);
     }
     return Success;