From 037500d28aee14c1ac5aafce81d2fb69bef43059 Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 16 Dec 2008 14:34:56 +0000 Subject: * generic/tcl.h: Add TIP 338 routines to stub table. * generic/tcl.decls: [Bug 2431338]. * generic/tclDecls.h: make genstubs * generic/tclStubInit.c: --- ChangeLog | 8 ++++++++ generic/tcl.decls | 10 +++++++++- generic/tcl.h | 5 +---- generic/tclDecls.h | 23 ++++++++++++++++++++++- generic/tclStubInit.c | 4 +++- 5 files changed, 43 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86efb0e..9c45911 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-12-16 Don Porter + + * generic/tcl.h: Add TIP 338 routines to stub table. + * generic/tcl.decls: [Bug 2431338]. + + * generic/tclDecls.h: make genstubs + * generic/tclStubInit.c: + 2008-12-15 Donal K. Fellows * generic/tclExecute.c (TEBC:INST_DICT_GET): Make sure that the result diff --git a/generic/tcl.decls b/generic/tcl.decls index 334f004..350c5d6 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tcl.decls,v 1.161 2008/12/15 18:33:25 dgp Exp $ +# RCS: @(#) $Id: tcl.decls,v 1.162 2008/12/16 14:34:56 dgp Exp $ library tcl @@ -2262,6 +2262,14 @@ declare 620 generic { declare 621 generic { int Tcl_ZlibStreamReset(Tcl_ZlibStream zshandle) } +# TIP 338 +declare 622 generic { + void Tcl_SetStartupScript(Tcl_Obj *path, const char *encoding) +} +declare 623 generic { + Tcl_Obj *Tcl_GetStartupScript(const char **encodingPtr) +} + ############################################################################## diff --git a/generic/tcl.h b/generic/tcl.h index 844dbcb..8539e0a 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tcl.h,v 1.282 2008/12/15 15:48:33 dgp Exp $ + * RCS: @(#) $Id: tcl.h,v 1.283 2008/12/16 14:34:56 dgp Exp $ */ #ifndef _TCL @@ -2339,9 +2339,6 @@ EXTERN const char * TclTomMathInitializeStubs (Tcl_Interp *interp, 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) diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 8c58b9c..c7e0286 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclDecls.h,v 1.162 2008/12/15 18:33:25 dgp Exp $ + * RCS: @(#) $Id: tclDecls.h,v 1.163 2008/12/16 14:34:56 dgp Exp $ */ #ifndef _TCLDECLS @@ -3758,6 +3758,17 @@ EXTERN int Tcl_ZlibStreamClose (Tcl_ZlibStream zshandle); /* 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 * path, + const char * encoding); +#endif +#ifndef Tcl_GetStartupScript_TCL_DECLARED +#define Tcl_GetStartupScript_TCL_DECLARED +/* 623 */ +EXTERN Tcl_Obj * Tcl_GetStartupScript (const char ** encodingPtr); +#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 * path, const char * encoding); /* 622 */ + Tcl_Obj * (*tcl_GetStartupScript) (const char ** encodingPtr); /* 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) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index d64f061..fbdeb13 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclStubInit.c,v 1.174 2008/12/15 15:48:33 dgp Exp $ + * RCS: @(#) $Id: tclStubInit.c,v 1.175 2008/12/16 14:34:57 dgp Exp $ */ #include "tclInt.h" @@ -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. */ -- cgit v0.12