diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | generic/tcl.decls | 8 | ||||
| -rw-r--r-- | generic/tclDecls.h | 15 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 16 |
4 files changed, 12 insertions, 30 deletions
@@ -3,6 +3,9 @@ * generic/tcl.decls [Bug 3007895] Tcl_(Find|Create)HashEntry * generic/tclHash.c stub entries can never be called. * generic/tclDecls.h + * generic/tclStubInit.c [Patch 2994165]: Change signature of + Tcl_FSGetNativePath and TclpDeleteFile follow-up: move + stub entry back to original location. 2010-08-23 Kevin B. Kenny <kennykb@acm.org> diff --git a/generic/tcl.decls b/generic/tcl.decls index a1ad722..3fadbce 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.177 2010/08/24 06:17:55 nijtmans Exp $ +# RCS: @(#) $Id: tcl.decls,v 1.178 2010/08/25 01:00:10 nijtmans Exp $ library tcl @@ -1671,7 +1671,7 @@ declare 468 generic { ClientData clientData) } declare 469 generic { - const char *TclFSGetNativePath(Tcl_Obj *pathPtr) + const void *Tcl_FSGetNativePath(Tcl_Obj *pathPtr) } declare 470 generic { Tcl_Obj *Tcl_FSFileSystemInfo(Tcl_Obj *pathPtr) @@ -2319,10 +2319,6 @@ declare 629 generic { int Tcl_FSUnloadFile(Tcl_Interp *interp, Tcl_LoadHandle handlePtr) } -declare 630 generic { - const void *Tcl_FSGetNativePath(Tcl_Obj *pathPtr) -} - # ----- BASELINE -- FOR -- 8.6.0 ----- # ############################################################################## diff --git a/generic/tclDecls.h b/generic/tclDecls.h index efb1e4b..c16ba1b 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.182 2010/08/24 06:17:55 nijtmans Exp $ + * RCS: @(#) $Id: tclDecls.h,v 1.183 2010/08/25 01:00:10 nijtmans Exp $ */ #ifndef _TCLDECLS @@ -1356,7 +1356,7 @@ EXTERN Tcl_Obj * Tcl_FSNewNativePath( const Tcl_Filesystem *fromFilesystem, ClientData clientData); /* 469 */ -EXTERN const char * TclFSGetNativePath(Tcl_Obj *pathPtr); +EXTERN const void * Tcl_FSGetNativePath(Tcl_Obj *pathPtr); /* 470 */ EXTERN Tcl_Obj * Tcl_FSFileSystemInfo(Tcl_Obj *pathPtr); /* 471 */ @@ -1810,8 +1810,6 @@ EXTERN void* Tcl_FindSymbol(Tcl_Interp *interp, /* 629 */ EXTERN int Tcl_FSUnloadFile(Tcl_Interp *interp, Tcl_LoadHandle handlePtr); -/* 630 */ -EXTERN const void * Tcl_FSGetNativePath(Tcl_Obj *pathPtr); typedef struct TclStubHooks { const struct TclPlatStubs *tclPlatStubs; @@ -2316,7 +2314,7 @@ typedef struct TclStubs { Tcl_Obj * (*tcl_FSGetTranslatedPath) (Tcl_Interp *interp, Tcl_Obj *pathPtr); /* 466 */ int (*tcl_FSEvalFile) (Tcl_Interp *interp, Tcl_Obj *fileName); /* 467 */ Tcl_Obj * (*tcl_FSNewNativePath) (const Tcl_Filesystem *fromFilesystem, ClientData clientData); /* 468 */ - const char * (*tclFSGetNativePath) (Tcl_Obj *pathPtr); /* 469 */ + const void * (*tcl_FSGetNativePath) (Tcl_Obj *pathPtr); /* 469 */ Tcl_Obj * (*tcl_FSFileSystemInfo) (Tcl_Obj *pathPtr); /* 470 */ Tcl_Obj * (*tcl_FSPathSeparator) (Tcl_Obj *pathPtr); /* 471 */ Tcl_Obj * (*tcl_FSListVolumes) (void); /* 472 */ @@ -2477,7 +2475,6 @@ typedef struct TclStubs { int (*tcl_LoadFile) (Tcl_Interp *interp, Tcl_Obj *pathPtr, const char *const symv[], int flags, void *procPtrs, Tcl_LoadHandle *handlePtr); /* 627 */ void* (*tcl_FindSymbol) (Tcl_Interp *interp, Tcl_LoadHandle handle, const char *symbol); /* 628 */ int (*tcl_FSUnloadFile) (Tcl_Interp *interp, Tcl_LoadHandle handlePtr); /* 629 */ - const void * (*tcl_FSGetNativePath) (Tcl_Obj *pathPtr); /* 630 */ } TclStubs; #ifdef __cplusplus @@ -3448,8 +3445,8 @@ extern const TclStubs *tclStubsPtr; (tclStubsPtr->tcl_FSEvalFile) /* 467 */ #define Tcl_FSNewNativePath \ (tclStubsPtr->tcl_FSNewNativePath) /* 468 */ -#define TclFSGetNativePath \ - (tclStubsPtr->tclFSGetNativePath) /* 469 */ +#define Tcl_FSGetNativePath \ + (tclStubsPtr->tcl_FSGetNativePath) /* 469 */ #define Tcl_FSFileSystemInfo \ (tclStubsPtr->tcl_FSFileSystemInfo) /* 470 */ #define Tcl_FSPathSeparator \ @@ -3770,8 +3767,6 @@ extern const TclStubs *tclStubsPtr; (tclStubsPtr->tcl_FindSymbol) /* 628 */ #define Tcl_FSUnloadFile \ (tclStubsPtr->tcl_FSUnloadFile) /* 629 */ -#define Tcl_FSGetNativePath \ - (tclStubsPtr->tcl_FSGetNativePath) /* 630 */ #endif /* defined(USE_TCL_STUBS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 8b0e08e..e004694 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.195 2010/08/21 16:30:26 nijtmans Exp $ + * RCS: @(#) $Id: tclStubInit.c,v 1.196 2010/08/25 01:00:10 nijtmans Exp $ */ #include "tclInt.h" @@ -41,17 +41,6 @@ #undef Tcl_CreateHashEntry #undef Tcl_Panic -/* Only provided in the stub table for backwards - * binary compatibility. - */ -#define TclFSGetNativePath getnativepath -static const char * -getnativepath( - Tcl_Obj *pathPtr) -{ - return Tcl_FSGetNativePath(pathPtr); -} - /* * WARNING: The contents of this file is automatically generated by the * tools/genStubs.tcl script. Any modifications to the function declarations @@ -974,7 +963,7 @@ const TclStubs tclStubs = { Tcl_FSGetTranslatedPath, /* 466 */ Tcl_FSEvalFile, /* 467 */ Tcl_FSNewNativePath, /* 468 */ - TclFSGetNativePath, /* 469 */ + Tcl_FSGetNativePath, /* 469 */ Tcl_FSFileSystemInfo, /* 470 */ Tcl_FSPathSeparator, /* 471 */ Tcl_FSListVolumes, /* 472 */ @@ -1135,7 +1124,6 @@ const TclStubs tclStubs = { Tcl_LoadFile, /* 627 */ Tcl_FindSymbol, /* 628 */ Tcl_FSUnloadFile, /* 629 */ - Tcl_FSGetNativePath, /* 630 */ }; /* !END!: Do not edit above this line. */ |