Remove Tclp(Local|Gm)time_unix forwarders, the same can be done directly

Some void -> VOID transitions

4 files changed, 22 insertions, 19 deletions

diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index c48cd0d..4fb88c6 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -640,7 +640,7 @@ declare 162 generic {
 # correct type when calling this procedure.
 
 declare 163 generic {
-	void * TclGetInstructionTable (void)
+	VOID *TclGetInstructionTable(void)
 }
 
 # ALERT: The argument of 'TclExpandCodeArray' is actually a
@@ -648,7 +648,7 @@ declare 163 generic {
 # "tclInt.h". It is described in "tclCompile.h".
 
 declare 164 generic {
-	void TclExpandCodeArray (void *envPtr)
+	void TclExpandCodeArray(VOID *envPtr)
 }
 
 # These functions are vfs aware, but are generally only useful internally.
@@ -790,13 +790,13 @@ declare 16 mac {
     int TclMacOSErrorToPosixError(int error)
 }
 declare 17 mac {
-    void TclMacRemoveTimer(void *timerToken)
+    void TclMacRemoveTimer(VOID *timerToken)
 }
 declare 18 mac {
-    void * TclMacStartTimer(long ms)
+    VOID *TclMacStartTimer(long ms)
 }
 declare 19 mac {
-    int TclMacTimerExpired(void *timerToken)
+    int TclMacTimerExpired(VOID *timerToken)
 }
 declare 20 mac {
     int TclMacRegisterResourceFork(short fileRef, Tcl_Obj *tokenPtr,
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 453532c..1d831ed 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -465,9 +465,9 @@ EXTERN int		TclChannelTransform _ANSI_ARGS_((Tcl_Interp * interp,
 EXTERN void		TclChannelEventScriptInvoker _ANSI_ARGS_((
 				ClientData clientData, int flags));
 /* 163 */
-EXTERN void *		TclGetInstructionTable _ANSI_ARGS_((void));
+EXTERN VOID *		TclGetInstructionTable _ANSI_ARGS_((void));
 /* 164 */
-EXTERN void		TclExpandCodeArray _ANSI_ARGS_((void * envPtr));
+EXTERN void		TclExpandCodeArray _ANSI_ARGS_((VOID * envPtr));
 /* 165 */
 EXTERN void		TclpSetInitialEncodings _ANSI_ARGS_((void));
 /* 166 */
@@ -722,8 +722,8 @@ typedef struct TclIntStubs {
     void *reserved160;
     int (*tclChannelTransform) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan, Tcl_Obj * cmdObjPtr)); /* 161 */
     void (*tclChannelEventScriptInvoker) _ANSI_ARGS_((ClientData clientData, int flags)); /* 162 */
-    void * (*tclGetInstructionTable) _ANSI_ARGS_((void)); /* 163 */
-    void (*tclExpandCodeArray) _ANSI_ARGS_((void * envPtr)); /* 164 */
+    VOID * (*tclGetInstructionTable) _ANSI_ARGS_((void)); /* 163 */
+    void (*tclExpandCodeArray) _ANSI_ARGS_((VOID * envPtr)); /* 164 */
     void (*tclpSetInitialEncodings) _ANSI_ARGS_((void)); /* 165 */
     int (*tclListObjSetElement) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * listPtr, int index, Tcl_Obj * valuePtr)); /* 166 */
     void (*tclSetStartupScriptPath) _ANSI_ARGS_((Tcl_Obj * pathPtr)); /* 167 */
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 3af099d..35bacf1 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -189,11 +189,11 @@ EXTERN OSErr		TclMacInstallExitToShellPatch _ANSI_ARGS_((
 /* 16 */
 EXTERN int		TclMacOSErrorToPosixError _ANSI_ARGS_((int error));
 /* 17 */
-EXTERN void		TclMacRemoveTimer _ANSI_ARGS_((void * timerToken));
+EXTERN void		TclMacRemoveTimer _ANSI_ARGS_((VOID * timerToken));
 /* 18 */
-EXTERN void *		TclMacStartTimer _ANSI_ARGS_((long ms));
+EXTERN VOID *		TclMacStartTimer _ANSI_ARGS_((long ms));
 /* 19 */
-EXTERN int		TclMacTimerExpired _ANSI_ARGS_((void * timerToken));
+EXTERN int		TclMacTimerExpired _ANSI_ARGS_((VOID * timerToken));
 /* 20 */
 EXTERN int		TclMacRegisterResourceFork _ANSI_ARGS_((
 				short fileRef, Tcl_Obj * tokenPtr, 
@@ -285,9 +285,9 @@ typedef struct TclIntPlatStubs {
     void (*tclMacInitExitToShell) _ANSI_ARGS_((int usePatch)); /* 14 */
     OSErr (*tclMacInstallExitToShellPatch) _ANSI_ARGS_((ExitToShellProcPtr newProc)); /* 15 */
     int (*tclMacOSErrorToPosixError) _ANSI_ARGS_((int error)); /* 16 */
-    void (*tclMacRemoveTimer) _ANSI_ARGS_((void * timerToken)); /* 17 */
-    void * (*tclMacStartTimer) _ANSI_ARGS_((long ms)); /* 18 */
-    int (*tclMacTimerExpired) _ANSI_ARGS_((void * timerToken)); /* 19 */
+    void (*tclMacRemoveTimer) _ANSI_ARGS_((VOID * timerToken)); /* 17 */
+    VOID * (*tclMacStartTimer) _ANSI_ARGS_((long ms)); /* 18 */
+    int (*tclMacTimerExpired) _ANSI_ARGS_((VOID * timerToken)); /* 19 */
     int (*tclMacRegisterResourceFork) _ANSI_ARGS_((short fileRef, Tcl_Obj * tokenPtr, int insert)); /* 20 */
     short (*tclMacUnRegisterResourceFork) _ANSI_ARGS_((char * tokenPtr, Tcl_Obj * resultPtr)); /* 21 */
     int (*tclMacCreateEnv) _ANSI_ARGS_((void)); /* 22 */
@@ -589,4 +589,7 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
+#undef TclpLocaltime_unix
+#undef TclpGmtime_unix
+
 #endif /* _TCLINTPLATDECLS */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 9d5a401..a81f3e8 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -29,10 +29,10 @@
 #undef Tcl_NewStringObj
 #undef Tcl_DumpActiveMemory
 #undef Tcl_ValidateAllMemory
-#if TCL_PRESERVE_BINARY_COMPATABILITY
-#   undef Tcl_FindHashEntry
-#   undef Tcl_CreateHashEntry
-#endif
+#undef Tcl_FindHashEntry
+#undef Tcl_CreateHashEntry
+#define TclpLocaltime_unix TclpLocaltime
+#define TclpGmtime_unix TclpGmtime
 
 /*
  * Keep a record of the original Notifier procedures, created in the