From 28e10d16ff23e12b9d930dcc0a73140af1265d93 Mon Sep 17 00:00:00 2001 From: Kevin B Kenny Date: Sat, 21 Apr 2007 19:52:12 +0000 Subject: * 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. --- ChangeLog | 10 ++++++++++ generic/tclInt.decls | 10 +++++----- generic/tclInt.h | 3 ++- generic/tclIntDecls.h | 10 +++++----- generic/tclIntPlatDecls.h | 10 +++++----- unix/tclUnixPort.h | 6 +++--- unix/tclUnixTime.c | 10 +++++----- win/tclWinTime.c | 6 +++--- 8 files changed, 38 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94a969b..2e1a7d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-04-21 Kevin B. Kenny + + * 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. + 2007-03-24 Zoran Vasiljevic * win/tclWinThrd.c: Thread exit handler marks the current 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__ diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index 46d14fa..d52b7d0 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -19,7 +19,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixPort.h,v 1.27.2.16 2006/09/07 08:50:36 vasiljevic Exp $ + * RCS: @(#) $Id: tclUnixPort.h,v 1.27.2.17 2007/04/21 19:52:15 kennykb Exp $ */ #ifndef _TCLUNIXPORT @@ -671,10 +671,10 @@ EXTERN void TclpMutexLock _ANSI_ARGS_((TclpMutex *mPtr)); EXTERN void TclpMutexUnlock _ANSI_ARGS_((TclpMutex *mPtr)); EXTERN Tcl_DirEntry * TclpReaddir(DIR *); #ifndef TclpLocaltime -EXTERN struct tm * TclpLocaltime(CONST TclpTime_t); +EXTERN struct tm * TclpLocaltime(TclpTime_t_CONST); #endif #ifndef TclpGmtime -EXTERN struct tm * TclpGmtime(CONST TclpTime_t); +EXTERN struct tm * TclpGmtime(TclpTime_t_CONST); #endif EXTERN char * TclpInetNtoa(struct in_addr); #define inet_ntoa(x) TclpInetNtoa(x) diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c index b7ef888..e4ac865 100644 --- a/unix/tclUnixTime.c +++ b/unix/tclUnixTime.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixTime.c,v 1.15.2.5 2007/03/19 17:06:26 dgp Exp $ + * RCS: @(#) $Id: tclUnixTime.c,v 1.15.2.6 2007/04/21 19:52:15 kennykb Exp $ */ #include "tclInt.h" @@ -344,7 +344,7 @@ TclpStrftime(s, maxsize, format, t, useGMT) struct tm * TclpGmtime( tt ) - CONST TclpTime_t tt; + TclpTime_t_CONST tt; { CONST time_t *timePtr = (CONST time_t *) tt; /* Pointer to the number of seconds @@ -371,7 +371,7 @@ TclpGmtime( tt ) */ struct tm* TclpGmtime_unix( timePtr ) - CONST TclpTime_t timePtr; + TclpTime_t_CONST timePtr; { return TclpGmtime( timePtr ); } @@ -395,7 +395,7 @@ TclpGmtime_unix( timePtr ) struct tm * TclpLocaltime( tt ) - CONST TclpTime_t tt; + TclpTime_t_CONST tt; { CONST time_t *timePtr = (CONST time_t *) tt; /* Pointer to the number of seconds @@ -422,7 +422,7 @@ TclpLocaltime( tt ) */ struct tm* TclpLocaltime_unix( timePtr ) - CONST TclpTime_t timePtr; + TclpTime_t_CONST timePtr; { return TclpLocaltime( timePtr ); } diff --git a/win/tclWinTime.c b/win/tclWinTime.c index f1c9d6a..044268b 100644 --- a/win/tclWinTime.c +++ b/win/tclWinTime.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinTime.c,v 1.14.2.10 2006/09/26 21:40:37 patthoyts Exp $ + * RCS: @(#) $Id: tclWinTime.c,v 1.14.2.11 2007/04/21 19:52:15 kennykb Exp $ */ #include "tclWinInt.h" @@ -1100,7 +1100,7 @@ AccumulateSample( Tcl_WideInt perfCounter, struct tm * TclpGmtime( tt ) - CONST TclpTime_t tt; + TclpTime_t_CONST tt; { CONST time_t *timePtr = (CONST time_t *) tt; /* Pointer to the number of seconds @@ -1132,7 +1132,7 @@ TclpGmtime( tt ) struct tm * TclpLocaltime( tt ) - CONST TclpTime_t tt; + TclpTime_t_CONST tt; { CONST time_t *timePtr = (CONST time_t *) tt; /* Pointer to the number of seconds -- cgit v0.12