* generic/tclInt.decls: Yet another round of attempting

* generic/tclInt.h:          to get the correct type signature
* unix/tclUnixPort.h:        for TclpLocaltime and TclpGmtime.
* unix/tclUnixTime.c:        CONST TclpTime_t is a 'time_t *CONST'
* win/tclWinTime.c:          and not a 'CONST time_t*'!
* generic/tclIntDecls.h:     [Bug 1677275]
* generic/tclIntPlatDecls.h: Regenerated.

4 files changed, 17 insertions, 16 deletions

diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 82d5e49..120ed0b 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.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: tclInt.decls,v 1.59.2.6 2005/03/15 16:29:53 kennykb Exp $
+# RCS: @(#) $Id: tclInt.decls,v 1.59.2.7 2007/04/21 19:52:14 kennykb Exp $
 
 library tcl
 
@@ -700,10 +700,10 @@ declare 173 generic {
 # TclpGmtime and TclpLocaltime promoted to the generic interface from unix
 
 declare 182 generic {
-     struct tm *TclpLocaltime(CONST TclpTime_t clock)
+     struct tm *TclpLocaltime(TclpTime_t_CONST clock)
 }
 declare 183 generic {
-     struct tm *TclpGmtime(CONST TclpTime_t clock)
+     struct tm *TclpGmtime(TclpTime_t_CONST clock)
 }
 
 declare 199 generic {
@@ -998,11 +998,11 @@ declare 10 unix {
 # generic Stubs
 
 declare 11 unix {
-    struct tm * TclpLocaltime_unix(CONST TclpTime_t clock)
+    struct tm * TclpLocaltime_unix(TclpTime_t_CONST clock)
 }
 
 declare 12 unix {
-    struct tm * TclpGmtime_unix(CONST TclpTime_t clock)
+    struct tm * TclpGmtime_unix(TclpTime_t_CONST clock)
 }
 
 declare 13 unix {
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 57e9e31..c1a6785 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -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: tclInt.h,v 1.118.2.26 2006/11/28 22:20:01 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.118.2.27 2007/04/21 19:52:14 kennykb Exp $
  */
 
 #ifndef _TCLINT
@@ -1702,6 +1702,7 @@ typedef struct TclFile_ *TclFile;
  */
 
 typedef struct TclpTime_t_    *TclpTime_t;
+typedef struct TclpTime_t_    *CONST TclpTime_t_CONST;
 
 /*
  * The "globParameters" argument of the function TclGlob is an
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index c761ae1..3660664 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclIntDecls.h,v 1.49.2.8 2005/03/15 16:29:53 kennykb Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.49.2.9 2007/04/21 19:52:14 kennykb Exp $
  */
 
 #ifndef _TCLINTDECLS
@@ -512,9 +512,9 @@ EXTERN int		TclUniCharMatch _ANSI_ARGS_((
 /* Slot 180 is reserved */
 /* Slot 181 is reserved */
 /* 182 */
-EXTERN struct tm *	TclpLocaltime _ANSI_ARGS_((CONST TclpTime_t clock));
+EXTERN struct tm *	TclpLocaltime _ANSI_ARGS_((TclpTime_t_CONST clock));
 /* 183 */
-EXTERN struct tm *	TclpGmtime _ANSI_ARGS_((CONST TclpTime_t clock));
+EXTERN struct tm *	TclpGmtime _ANSI_ARGS_((TclpTime_t_CONST clock));
 /* Slot 184 is reserved */
 /* Slot 185 is reserved */
 /* Slot 186 is reserved */
@@ -743,8 +743,8 @@ typedef struct TclIntStubs {
     void *reserved179;
     void *reserved180;
     void *reserved181;
-    struct tm * (*tclpLocaltime) _ANSI_ARGS_((CONST TclpTime_t clock)); /* 182 */
-    struct tm * (*tclpGmtime) _ANSI_ARGS_((CONST TclpTime_t clock)); /* 183 */
+    struct tm * (*tclpLocaltime) _ANSI_ARGS_((TclpTime_t_CONST clock)); /* 182 */
+    struct tm * (*tclpGmtime) _ANSI_ARGS_((TclpTime_t_CONST clock)); /* 183 */
     void *reserved184;
     void *reserved185;
     void *reserved186;
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index e5a3ca0..671e6c7 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.19.2.6 2004/10/28 16:06:49 kennykb Exp $
+ * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.19.2.7 2007/04/21 19:52:14 kennykb Exp $
  */
 
 #ifndef _TCLINTPLATDECLS
@@ -63,9 +63,9 @@ EXTERN TclFile		TclpCreateTempFile _ANSI_ARGS_((
 EXTERN Tcl_DirEntry *	TclpReaddir _ANSI_ARGS_((DIR * dir));
 /* 11 */
 EXTERN struct tm *	TclpLocaltime_unix _ANSI_ARGS_((
-				CONST TclpTime_t clock));
+				TclpTime_t_CONST clock));
 /* 12 */
-EXTERN struct tm *	TclpGmtime_unix _ANSI_ARGS_((CONST TclpTime_t clock));
+EXTERN struct tm *	TclpGmtime_unix _ANSI_ARGS_((TclpTime_t_CONST clock));
 /* 13 */
 EXTERN char *		TclpInetNtoa _ANSI_ARGS_((struct in_addr addr));
 #endif /* UNIX */
@@ -233,8 +233,8 @@ typedef struct TclIntPlatStubs {
     int (*tclUnixWaitForFile) _ANSI_ARGS_((int fd, int mask, int timeout)); /* 8 */
     TclFile (*tclpCreateTempFile) _ANSI_ARGS_((CONST char * contents)); /* 9 */
     Tcl_DirEntry * (*tclpReaddir) _ANSI_ARGS_((DIR * dir)); /* 10 */
-    struct tm * (*tclpLocaltime_unix) _ANSI_ARGS_((CONST TclpTime_t clock)); /* 11 */
-    struct tm * (*tclpGmtime_unix) _ANSI_ARGS_((CONST TclpTime_t clock)); /* 12 */
+    struct tm * (*tclpLocaltime_unix) _ANSI_ARGS_((TclpTime_t_CONST clock)); /* 11 */
+    struct tm * (*tclpGmtime_unix) _ANSI_ARGS_((TclpTime_t_CONST clock)); /* 12 */
     char * (*tclpInetNtoa) _ANSI_ARGS_((struct in_addr addr)); /* 13 */
 #endif /* UNIX */
 #ifdef __WIN32__