Move new Tcl_GetAliasObj() to slot 285 (old slot was used for Tcl_FreeResult() in 8.x)

3 files changed, 19 insertions, 22 deletions

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 2bc1934..f57eb2e 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -470,11 +470,6 @@ declare 145 {
 declare 146 {
     int Tcl_Flush(Tcl_Channel chan)
 }
-declare 147 {
-    int Tcl_GetAliasObj(Tcl_Interp *interp, const char *childCmd,
-	    Tcl_Interp **targetInterpPtr, const char **targetCmdPtr,
-	    Tcl_Size *objcPtr, Tcl_Obj ***objvPtr)
-}
 declare 149 {
     int TclGetAliasObj(Tcl_Interp *interp, const char *childCmd,
 	    Tcl_Interp **targetInterpPtr, const char **targetCmdPtr,
@@ -880,9 +875,11 @@ declare 284 {
     void Tcl_SetMainLoop(Tcl_MainLoopProc *proc)
 }
 
-# Reserved for future use (8.0.x vs. 8.1)
-#  declare 285 {
-#  }
+declare 285 {
+    int Tcl_GetAliasObj(Tcl_Interp *interp, const char *childCmd,
+	    Tcl_Interp **targetInterpPtr, const char **targetCmdPtr,
+	    Tcl_Size *objcPtr, Tcl_Obj ***objvPtr)
+}
 
 # Added in 8.1:
 
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index c867549..d261921 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -426,12 +426,7 @@ EXTERN Tcl_HashEntry *	Tcl_FirstHashEntry(Tcl_HashTable *tablePtr,
 				Tcl_HashSearch *searchPtr);
 /* 146 */
 EXTERN int		Tcl_Flush(Tcl_Channel chan);
-/* 147 */
-EXTERN int		Tcl_GetAliasObj(Tcl_Interp *interp,
-				const char *childCmd,
-				Tcl_Interp **targetInterpPtr,
-				const char **targetCmdPtr, Tcl_Size *objcPtr,
-				Tcl_Obj ***objvPtr);
+/* Slot 147 is reserved */
 /* Slot 148 is reserved */
 /* 149 */
 EXTERN int		TclGetAliasObj(Tcl_Interp *interp,
@@ -761,7 +756,12 @@ EXTERN int		Tcl_UnstackChannel(Tcl_Interp *interp,
 EXTERN Tcl_Channel	Tcl_GetStackedChannel(Tcl_Channel chan);
 /* 284 */
 EXTERN void		Tcl_SetMainLoop(Tcl_MainLoopProc *proc);
-/* Slot 285 is reserved */
+/* 285 */
+EXTERN int		Tcl_GetAliasObj(Tcl_Interp *interp,
+				const char *childCmd,
+				Tcl_Interp **targetInterpPtr,
+				const char **targetCmdPtr, Tcl_Size *objcPtr,
+				Tcl_Obj ***objvPtr);
 /* 286 */
 EXTERN void		Tcl_AppendObjToObj(Tcl_Obj *objPtr,
 				Tcl_Obj *appendObjPtr);
@@ -2026,7 +2026,7 @@ typedef struct TclStubs {
     void (*reserved144)(void);
     Tcl_HashEntry * (*tcl_FirstHashEntry) (Tcl_HashTable *tablePtr, Tcl_HashSearch *searchPtr); /* 145 */
     int (*tcl_Flush) (Tcl_Channel chan); /* 146 */
-    int (*tcl_GetAliasObj) (Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, Tcl_Size *objcPtr, Tcl_Obj ***objvPtr); /* 147 */
+    void (*reserved147)(void);
     void (*reserved148)(void);
     int (*tclGetAliasObj) (Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *objcPtr, Tcl_Obj ***objvPtr); /* 149 */
     void * (*tcl_GetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc **procPtr); /* 150 */
@@ -2164,7 +2164,7 @@ typedef struct TclStubs {
     int (*tcl_UnstackChannel) (Tcl_Interp *interp, Tcl_Channel chan); /* 282 */
     Tcl_Channel (*tcl_GetStackedChannel) (Tcl_Channel chan); /* 283 */
     void (*tcl_SetMainLoop) (Tcl_MainLoopProc *proc); /* 284 */
-    void (*reserved285)(void);
+    int (*tcl_GetAliasObj) (Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, Tcl_Size *objcPtr, Tcl_Obj ***objvPtr); /* 285 */
     void (*tcl_AppendObjToObj) (Tcl_Obj *objPtr, Tcl_Obj *appendObjPtr); /* 286 */
     Tcl_Encoding (*tcl_CreateEncoding) (const Tcl_EncodingType *typePtr); /* 287 */
     void (*tcl_CreateThreadExitHandler) (Tcl_ExitProc *proc, void *clientData); /* 288 */
@@ -2859,8 +2859,7 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_FirstHashEntry) /* 145 */
 #define Tcl_Flush \
 	(tclStubsPtr->tcl_Flush) /* 146 */
-#define Tcl_GetAliasObj \
-	(tclStubsPtr->tcl_GetAliasObj) /* 147 */
+/* Slot 147 is reserved */
 /* Slot 148 is reserved */
 #define TclGetAliasObj \
 	(tclStubsPtr->tclGetAliasObj) /* 149 */
@@ -3108,7 +3107,8 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_GetStackedChannel) /* 283 */
 #define Tcl_SetMainLoop \
 	(tclStubsPtr->tcl_SetMainLoop) /* 284 */
-/* Slot 285 is reserved */
+#define Tcl_GetAliasObj \
+	(tclStubsPtr->tcl_GetAliasObj) /* 285 */
 #define Tcl_AppendObjToObj \
 	(tclStubsPtr->tcl_AppendObjToObj) /* 286 */
 #define Tcl_CreateEncoding \
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 1d8dd7a..2dcb747 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -966,7 +966,7 @@ const TclStubs tclStubs = {
     0, /* 144 */
     Tcl_FirstHashEntry, /* 145 */
     Tcl_Flush, /* 146 */
-    Tcl_GetAliasObj, /* 147 */
+    0, /* 147 */
     0, /* 148 */
     TclGetAliasObj, /* 149 */
     Tcl_GetAssocData, /* 150 */
@@ -1104,7 +1104,7 @@ const TclStubs tclStubs = {
     Tcl_UnstackChannel, /* 282 */
     Tcl_GetStackedChannel, /* 283 */
     Tcl_SetMainLoop, /* 284 */
-    0, /* 285 */
+    Tcl_GetAliasObj, /* 285 */
     Tcl_AppendObjToObj, /* 286 */
     Tcl_CreateEncoding, /* 287 */
     Tcl_CreateThreadExitHandler, /* 288 */