Remove the TclpGetTZName implementation for Cygwin

(from 2012-04-02 commit)

4 files changed, 16 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index 72d3507..b053c8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-03  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tclStubInit.c      Remove the TclpGetTZName implementation for
+	* generic/tclIntDecls.h:     Cygwin (from 2012-04-02 commit) , re-generated
+	* generic/tclIntPlatDecls.h:
+
 2012-04-02  Donal K. Fellows  <dkf@users.sf.net>
 
 	IMPLEMENTATION OF TIP#396.
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 5496b4b..0c66c91 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)
@@ -735,16 +735,6 @@ declare 177 {
 #    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 {
@@ -1234,9 +1224,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 20da2fd..a222403 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -100,8 +100,7 @@ EXTERN void		TclWinAddProcess(void *hProcess, unsigned int id);
 /* Slot 21 is reserved */
 /* 22 */
 EXTERN TclFile		TclpCreateTempFile(const char *contents);
-/* 23 */
-EXTERN char *		TclpGetTZName(int isdst);
+/* Slot 23 is reserved */
 /* 24 */
 EXTERN char *		TclWinNoBackslash(char *path);
 /* Slot 25 is reserved */
@@ -244,8 +243,7 @@ EXTERN void		TclWinAddProcess(void *hProcess, unsigned int id);
 /* Slot 21 is reserved */
 /* 22 */
 EXTERN TclFile		TclpCreateTempFile(const char *contents);
-/* 23 */
-EXTERN char *		TclpGetTZName(int isdst);
+/* Slot 23 is reserved */
 /* 24 */
 EXTERN char *		TclWinNoBackslash(char *path);
 /* Slot 25 is reserved */
@@ -292,7 +290,7 @@ typedef struct TclIntPlatStubs {
     void (*tclWinAddProcess) (void *hProcess, unsigned int id); /* 20 */
     void (*reserved21)(void);
     TclFile (*tclpCreateTempFile) (const char *contents); /* 22 */
-    char * (*tclpGetTZName) (int isdst); /* 23 */
+    void (*reserved23)(void);
     char * (*tclWinNoBackslash) (char *path); /* 24 */
     void (*reserved25)(void);
     void (*tclWinSetInterfaces) (int wide); /* 26 */
@@ -358,7 +356,7 @@ typedef struct TclIntPlatStubs {
     void (*tclWinAddProcess) (void *hProcess, unsigned int id); /* 20 */
     void (*reserved21)(void);
     TclFile (*tclpCreateTempFile) (const char *contents); /* 22 */
-    char * (*tclpGetTZName) (int isdst); /* 23 */
+    void (*reserved23)(void);
     char * (*tclWinNoBackslash) (char *path); /* 24 */
     void (*reserved25)(void);
     void (*tclWinSetInterfaces) (int wide); /* 26 */
@@ -427,8 +425,7 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 /* Slot 21 is reserved */
 #define TclpCreateTempFile \
 	(tclIntPlatStubsPtr->tclpCreateTempFile) /* 22 */
-#define TclpGetTZName \
-	(tclIntPlatStubsPtr->tclpGetTZName) /* 23 */
+/* Slot 23 is reserved */
 #define TclWinNoBackslash \
 	(tclIntPlatStubsPtr->tclWinNoBackslash) /* 24 */
 /* Slot 25 is reserved */
@@ -546,8 +543,7 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr;
 /* Slot 21 is reserved */
 #define TclpCreateTempFile \
 	(tclIntPlatStubsPtr->tclpCreateTempFile) /* 22 */
-#define TclpGetTZName \
-	(tclIntPlatStubsPtr->tclpGetTZName) /* 23 */
+/* Slot 23 is reserved */
 #define TclWinNoBackslash \
 	(tclIntPlatStubsPtr->tclWinNoBackslash) /* 24 */
 /* Slot 25 is reserved */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 53b2015..e032874 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -53,7 +53,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
@@ -62,11 +61,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()
 {
@@ -97,16 +91,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;
@@ -172,7 +156,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
@@ -482,7 +465,7 @@ static const TclIntPlatStubs tclIntPlatStubs = {
     TclWinAddProcess, /* 20 */
     0, /* 21 */
     TclpCreateTempFile, /* 22 */
-    TclpGetTZName, /* 23 */
+    0, /* 23 */
     TclWinNoBackslash, /* 24 */
     0, /* 25 */
     TclWinSetInterfaces, /* 26 */
@@ -548,7 +531,7 @@ static const TclIntPlatStubs tclIntPlatStubs = {
     TclWinAddProcess, /* 20 */
     0, /* 21 */
     TclpCreateTempFile, /* 22 */
-    TclpGetTZName, /* 23 */
+    0, /* 23 */
     TclWinNoBackslash, /* 24 */
     0, /* 25 */
     TclWinSetInterfaces, /* 26 */