Tcl Source Code

Artifact 7a92080cffa2832dddc582b4c62054473d44f7c0:

Attachment "2431338.diff" to ticket [2431338fff] added by das 2008-12-16 00:44:18.

---

Index: generic/tcl.decls
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tcl.decls,v
retrieving revision 1.160
diff -u -p -r1.160 tcl.decls
--- generic/tcl.decls	11 Dec 2008 14:16:41 -0000	1.160
+++ generic/tcl.decls	15 Dec 2008 17:42:06 -0000
@@ -2262,6 +2262,13 @@ declare 620 generic {
 declare 621 generic {
     int Tcl_ZlibStreamReset(Tcl_ZlibStream zshandle)
 }
+# TIP#338
+declare 622 generic {
+    void Tcl_SetStartupScript(Tcl_Obj *pathPtr, const char* encodingName)
+}
+declare 623 generic {
+    Tcl_Obj *Tcl_GetStartupScript(const char **encodingNamePtr)
+}
 
 ##############################################################################
 
Index: generic/tcl.h
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tcl.h,v
retrieving revision 1.282
diff -u -p -r1.282 tcl.h
--- generic/tcl.h	15 Dec 2008 15:48:33 -0000	1.282
+++ generic/tcl.h	15 Dec 2008 17:42:14 -0000
@@ -2339,9 +2339,6 @@ EXTERN const char *	TclTomMathInitialize
 
 EXTERN void		Tcl_Main (int argc, char **argv,
 				Tcl_AppInitProc *appInitProc);
-EXTERN void		Tcl_SetStartupScript(Tcl_Obj *path,
-				const char *encoding);
-EXTERN Tcl_Obj *	Tcl_GetStartupScript(const char **encodingPtr);
 EXTERN const char *	Tcl_PkgInitStubsCheck (Tcl_Interp *interp,
 				const char *version, int exact);
 #if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
Index: generic/tclDecls.h
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclDecls.h,v
retrieving revision 1.161
diff -u -p -r1.161 tclDecls.h
--- generic/tclDecls.h	11 Dec 2008 14:17:23 -0000	1.161
+++ generic/tclDecls.h	15 Dec 2008 17:42:34 -0000
@@ -3758,6 +3758,17 @@ EXTERN int		Tcl_ZlibStreamClose (Tcl_Zli
 /* 621 */
 EXTERN int		Tcl_ZlibStreamReset (Tcl_ZlibStream zshandle);
 #endif
+#ifndef Tcl_SetStartupScript_TCL_DECLARED
+#define Tcl_SetStartupScript_TCL_DECLARED
+/* 622 */
+EXTERN void		Tcl_SetStartupScript (Tcl_Obj * pathPtr,
+				const char* encodingName);
+#endif
+#ifndef Tcl_GetStartupScript_TCL_DECLARED
+#define Tcl_GetStartupScript_TCL_DECLARED
+/* 623 */
+EXTERN Tcl_Obj *	Tcl_GetStartupScript (const char ** encodingNamePtr);
+#endif
 
 typedef struct TclStubHooks {
     const struct TclPlatStubs *tclPlatStubs;
@@ -4439,6 +4450,8 @@ typedef struct TclStubs {
     int (*tcl_ZlibStreamGet) (Tcl_ZlibStream zshandle, Tcl_Obj * data, int count); /* 619 */
     int (*tcl_ZlibStreamClose) (Tcl_ZlibStream zshandle); /* 620 */
     int (*tcl_ZlibStreamReset) (Tcl_ZlibStream zshandle); /* 621 */
+    void (*tcl_SetStartupScript) (Tcl_Obj * pathPtr, const char* encodingName); /* 622 */
+    Tcl_Obj * (*tcl_GetStartupScript) (const char ** encodingNamePtr); /* 623 */
 } TclStubs;
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
@@ -6999,6 +7012,14 @@ extern const TclStubs *tclStubsPtr;
 #define Tcl_ZlibStreamReset \
 	(tclStubsPtr->tcl_ZlibStreamReset) /* 621 */
 #endif
+#ifndef Tcl_SetStartupScript
+#define Tcl_SetStartupScript \
+	(tclStubsPtr->tcl_SetStartupScript) /* 622 */
+#endif
+#ifndef Tcl_GetStartupScript
+#define Tcl_GetStartupScript \
+	(tclStubsPtr->tcl_GetStartupScript) /* 623 */
+#endif
 
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
 
Index: generic/tclInt.decls
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclInt.decls,v
retrieving revision 1.132
diff -u -p -r1.132 tclInt.decls
--- generic/tclInt.decls	15 Dec 2008 15:48:33 -0000	1.132
+++ generic/tclInt.decls	15 Dec 2008 17:42:35 -0000
@@ -624,11 +624,11 @@ declare 156 generic {
 declare 157 generic {
     Var *TclVarTraceExists(Tcl_Interp *interp, const char *varName)
 }
-# REMOVED - use public Tcl_SetStartupPath()
+# REMOVED - use public Tcl_SetStartupScript()
 #declare 158 generic {
 #    void TclSetStartupScriptFileName(const char *filename)
 #}
-# REMOVED - use public Tcl_GetStartupPath()
+# REMOVED - use public Tcl_GetStartupScript()
 #declare 159 generic {
 #    CONST84_RETURN char *TclGetStartupScriptFileName(void)
 #}
@@ -676,11 +676,11 @@ declare 166 generic {
 }
 
 # VFS-aware versions of Tcl*StartupScriptFileName (158 and 159 above)
-# REMOVED - use public Tcl_SetStartupPath()
+# REMOVED - use public Tcl_SetStartupScript()
 #declare 167 generic {
 #    void TclSetStartupScriptPath(Tcl_Obj *pathPtr)
 #}
-# REMOVED - use public Tcl_GetStartupPath()
+# REMOVED - use public Tcl_GetStartupScript()
 #declare 168 generic {
 #    Tcl_Obj *TclGetStartupScriptPath(void)
 #}
Index: generic/tclStubInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclStubInit.c,v
retrieving revision 1.174
diff -u -p -r1.174 tclStubInit.c
--- generic/tclStubInit.c	15 Dec 2008 15:48:33 -0000	1.174
+++ generic/tclStubInit.c	15 Dec 2008 17:42:44 -0000
@@ -1147,6 +1147,8 @@ static const TclStubs tclStubs = {
     Tcl_ZlibStreamGet, /* 619 */
     Tcl_ZlibStreamClose, /* 620 */
     Tcl_ZlibStreamReset, /* 621 */
+    Tcl_SetStartupScript, /* 622 */
+    Tcl_GetStartupScript, /* 623 */
 };
 
 /* !END!: Do not edit above this line. */