From 34916714c2a78b655ee536afe9b482c8161ae0e3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 28 Mar 2013 15:22:05 +0000
Subject: Remove dead code. During 8.6 alpha/beta,
 Tk_DefineBitmap/Tk_GetBitmapFromData moved to stub entry 274/275 due to a
 signature change, but later that turned out not be necessary at all. The stub
 entries were kept in order not to lose binary compatibility for extensions
 that were compiled against beta 8.6 headers. Now that Tk 8.6 is final, this
 makes no sense any more.

---
 generic/tk.decls     |  7 -------
 generic/tkDecls.h    | 10 ----------
 generic/tkStubInit.c |  5 -----
 3 files changed, 22 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index 11b4f87..9ceb3af 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1069,13 +1069,6 @@ declare 273 {
     void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
 }
 
-declare 274 {
-    void reserved274(void)
-}
-declare 275 {
-    void reserved275(void)
-}
-
 # Define the platform specific public Tk interface.  These functions are
 # only available on the designated platform.
 
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 4de4c23..9f76a49 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -860,10 +860,6 @@ EXTERN void		Tk_CreateOldImageType(const Tk_ImageType *typePtr);
 /* 273 */
 EXTERN void		Tk_CreateOldPhotoImageFormat(
 				const Tk_PhotoImageFormat *formatPtr);
-/* 274 */
-EXTERN void		reserved274(void);
-/* 275 */
-EXTERN void		reserved275(void);
 
 typedef struct {
     const struct TkPlatStubs *tkPlatStubs;
@@ -1150,8 +1146,6 @@ typedef struct TkStubs {
     Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */
     void (*tk_CreateOldImageType) (const Tk_ImageType *typePtr); /* 272 */
     void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat *formatPtr); /* 273 */
-    void (*reserved274) (void); /* 274 */
-    void (*reserved275) (void); /* 275 */
 } TkStubs;
 
 #ifdef __cplusplus
@@ -1714,10 +1708,6 @@ extern const TkStubs *tkStubsPtr;
 	(tkStubsPtr->tk_CreateOldImageType) /* 272 */
 #define Tk_CreateOldPhotoImageFormat \
 	(tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */
-#define reserved274 \
-	(tkStubsPtr->reserved274) /* 274 */
-#define reserved275 \
-	(tkStubsPtr->reserved275) /* 275 */
 
 #endif /* defined(USE_TK_STUBS) */
 
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index b1cdd53..d141b02 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -226,9 +226,6 @@ void TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c)
 #   endif
 #endif /* !__WIN32__ */
 
-#define reserved274 (void (*)(void)) Tk_DefineBitmap
-#define reserved275 (void (*)(void)) Tk_GetBitmapFromData
-
 /*
  * WARNING: The contents of this file is automatically generated by the
  * tools/genStubs.tcl script. Any modifications to the function declarations
@@ -1106,8 +1103,6 @@ const TkStubs tkStubs = {
     Tk_Interp, /* 271 */
     Tk_CreateOldImageType, /* 272 */
     Tk_CreateOldPhotoImageFormat, /* 273 */
-    reserved274, /* 274 */
-    reserved275, /* 275 */
 };
 
 /* !END!: Do not edit above this line. */
-- 
cgit v0.12