diff options
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tclInt.decls | 21 | ||||
-rw-r--r-- | generic/tclIntPlatDecls.h | 26 | ||||
-rw-r--r-- | generic/tclStubInit.c | 21 |
3 files changed, 12 insertions, 56 deletions
diff --git a/generic/tclInt.decls b/generic/tclInt.decls index c115d23..71615ec 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -126,8 +126,8 @@ declare 25 { # } # Removed in 8.5 #declare 27 { -# int TclGetDate(char *p, unsigned long now, long zone, -# unsigned long *timePtr) +# int TclGetDate(char *p, Tcl_WideInt now, long zone, +# Tcl_WideInt *timePtr) #} declare 28 { Tcl_Channel TclpGetDefaultStdChannel(int type) @@ -415,7 +415,7 @@ declare 102 { void TclSetupEnv(Tcl_Interp *interp) } declare 103 { - int TclSockGetPort(Tcl_Interp *interp, const char *str, CONST char *proto, + int TclSockGetPort(Tcl_Interp *interp, const char *str, const char *proto, int *portPtr) } declare 104 { @@ -643,7 +643,7 @@ declare 162 { } # ALERT: The result of 'TclGetInstructionTable' is actually a -# "InstructionDesc*" but we do not want to describe this structure in +# "const InstructionDesc*" but we do not want to describe this structure in # "tclInt.h". It is described in "tclCompile.h". Use a cast to the # correct type when calling this procedure. @@ -729,16 +729,6 @@ declare 179 { Tcl_Obj *Tcl_GetStartupScript(const char **encodingNamePtr) } -# REMOVED -# Allocate lists without copying arrays -# declare 180 { -# Tcl_Obj *TclNewListObjDirect(int objc, Tcl_Obj **objv) -# } -#declare 181 { -# Tcl_Obj *TclDbNewListObjDirect(int objc, Tcl_Obj **objv, -# const char *file, int line) -#} - # TclpGmtime and TclpLocaltime promoted to the generic interface from unix declare 182 { @@ -1174,9 +1164,6 @@ declare 20 unix { declare 22 unix { TclFile TclpCreateTempFile(const char *contents) } -declare 23 unix { - char *TclpGetTZName(int isdst) -} declare 24 unix { char *TclWinNoBackslash(char *path) } diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h index 801ee49..b3976c8 100644 --- a/generic/tclIntPlatDecls.h +++ b/generic/tclIntPlatDecls.h @@ -157,11 +157,7 @@ EXTERN void TclWinAddProcess(VOID *hProcess, unsigned int id); /* 22 */ EXTERN TclFile TclpCreateTempFile(CONST char *contents); #endif -#ifndef TclpGetTZName_TCL_DECLARED -#define TclpGetTZName_TCL_DECLARED -/* 23 */ -EXTERN char * TclpGetTZName(int isdst); -#endif +/* Slot 23 is reserved */ #ifndef TclWinNoBackslash_TCL_DECLARED #define TclWinNoBackslash_TCL_DECLARED /* 24 */ @@ -460,11 +456,7 @@ EXTERN void TclWinAddProcess(VOID *hProcess, unsigned int id); /* 22 */ EXTERN TclFile TclpCreateTempFile(CONST char *contents); #endif -#ifndef TclpGetTZName_TCL_DECLARED -#define TclpGetTZName_TCL_DECLARED -/* 23 */ -EXTERN char * TclpGetTZName(int isdst); -#endif +/* Slot 23 is reserved */ #ifndef TclWinNoBackslash_TCL_DECLARED #define TclWinNoBackslash_TCL_DECLARED /* 24 */ @@ -532,7 +524,7 @@ typedef struct TclIntPlatStubs { void (*tclWinAddProcess) (VOID *hProcess, unsigned int id); /* 20 */ VOID *reserved21; TclFile (*tclpCreateTempFile) (CONST char *contents); /* 22 */ - char * (*tclpGetTZName) (int isdst); /* 23 */ + VOID *reserved23; char * (*tclWinNoBackslash) (char *path); /* 24 */ VOID *reserved25; void (*tclWinSetInterfaces) (int wide); /* 26 */ @@ -598,7 +590,7 @@ typedef struct TclIntPlatStubs { void (*tclWinAddProcess) (VOID *hProcess, unsigned int id); /* 20 */ VOID *reserved21; TclFile (*tclpCreateTempFile) (CONST char *contents); /* 22 */ - char * (*tclpGetTZName) (int isdst); /* 23 */ + VOID *reserved23; char * (*tclWinNoBackslash) (char *path); /* 24 */ VOID *reserved25; void (*tclWinSetInterfaces) (int wide); /* 26 */ @@ -705,10 +697,7 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr; #define TclpCreateTempFile \ (tclIntPlatStubsPtr->tclpCreateTempFile) /* 22 */ #endif -#ifndef TclpGetTZName -#define TclpGetTZName \ - (tclIntPlatStubsPtr->tclpGetTZName) /* 23 */ -#endif +/* Slot 23 is reserved */ #ifndef TclWinNoBackslash #define TclWinNoBackslash \ (tclIntPlatStubsPtr->tclWinNoBackslash) /* 24 */ @@ -930,10 +919,7 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr; #define TclpCreateTempFile \ (tclIntPlatStubsPtr->tclpCreateTempFile) /* 22 */ #endif -#ifndef TclpGetTZName -#define TclpGetTZName \ - (tclIntPlatStubsPtr->tclpGetTZName) /* 23 */ -#endif +/* Slot 23 is reserved */ #ifndef TclWinNoBackslash #define TclWinNoBackslash \ (tclIntPlatStubsPtr->tclWinNoBackslash) /* 24 */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 94f279e..4c70f00 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -74,7 +74,6 @@ int __stdcall GetModuleHandleExW(unsigned int, const char *, void *); #define TclWinGetTclInstance winGetTclInstance #define TclWinNToHS winNToHS #define TclWinSetSockOpt winSetSockOpt -#define TclpGetTZName pGetTZName #define TclWinNoBackslash winNoBackslash #define TclWinSetInterfaces (void (*) (int)) doNothing #define TclWinAddProcess (void (*) (void *, unsigned int)) doNothing @@ -83,11 +82,6 @@ int __stdcall GetModuleHandleExW(unsigned int, const char *, void *); static Tcl_Encoding winTCharEncoding; -typedef struct ThreadSpecificData { - char tzName[64]; /* Time zone name */ -} ThreadSpecificData; -static Tcl_ThreadDataKey dataKey; - static int TclWinGetPlatformId() { @@ -118,16 +112,6 @@ TclWinSetSockOpt(void *s, int level, int optname, } static char * -TclpGetTZName(int isdst) -{ - ThreadSpecificData *tsdPtr = TCL_TSD_INIT(&dataKey); - const char *zone = getenv("TZ"); - Tcl_ExternalToUtf(NULL, NULL, zone, strlen(zone), 0, NULL, - tsdPtr->tzName, sizeof(tsdPtr->tzName), NULL, NULL, NULL); - return tsdPtr->tzName; -} - -static char * TclWinNoBackslash(char *path) { char *p; @@ -192,7 +176,6 @@ Tcl_WinTCharToUtf( # define TclWinNToHS (unsigned short (*) _ANSI_ARGS_((unsigned short ns))) TclpMakeFile # define TclWinSetSockOpt (int (*) _ANSI_ARGS_((void *, int, int, const char *, int))) TclpOpenFile # define TclWinAddProcess 0 -# define TclpGetTZName 0 # define TclWinNoBackslash 0 # define TclWinSetInterfaces 0 # define TclWinFlushDirtyChannels 0 @@ -498,7 +481,7 @@ TclIntPlatStubs tclIntPlatStubs = { TclWinAddProcess, /* 20 */ NULL, /* 21 */ TclpCreateTempFile, /* 22 */ - TclpGetTZName, /* 23 */ + NULL, /* 23 */ TclWinNoBackslash, /* 24 */ NULL, /* 25 */ TclWinSetInterfaces, /* 26 */ @@ -564,7 +547,7 @@ TclIntPlatStubs tclIntPlatStubs = { TclWinAddProcess, /* 20 */ NULL, /* 21 */ TclpCreateTempFile, /* 22 */ - TclpGetTZName, /* 23 */ + NULL, /* 23 */ TclWinNoBackslash, /* 24 */ NULL, /* 25 */ TclWinSetInterfaces, /* 26 */ |