From ea82af5be8dd81792dc64f9f608b5094bd34beb5 Mon Sep 17 00:00:00 2001 From: kennykb Date: Sat, 21 Apr 2007 22:42:46 +0000 Subject: Restored Cygwin buildability [Bug 1387154] FossilOrigin-Name: 336c551ccc103380d932482ead2b120f4bcb1d13 --- ChangeLog | 5 +++-- generic/tclClock.c | 6 +++--- unix/tclUnixPort.h | 10 +++++++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e1a7d6..055bf30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,12 @@ 2007-04-21 Kevin B. Kenny + * generic/tclClock.c: Restored Cygwin buildability [Bug 1387154] * 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] + * win/tclWinTime.c: and not a 'CONST time_t*' [Bug 1677275] + * generic/tclIntDecls.h: * generic/tclIntPlatDecls.h: Regenerated. 2007-03-24 Zoran Vasiljevic diff --git a/generic/tclClock.c b/generic/tclClock.c index d476795..a939fb2 100644 --- a/generic/tclClock.c +++ b/generic/tclClock.c @@ -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: tclClock.c,v 1.20.2.2 2005/03/15 16:29:53 kennykb Exp $ + * RCS: @(#) $Id: tclClock.c,v 1.20.2.3 2007/04/21 22:42:49 kennykb Exp $ */ #include "tcl.h" @@ -266,8 +266,8 @@ FormatClock(interp, clockVal, useGMT, format) int result; time_t tclockVal; #if !defined(HAVE_TM_ZONE) && !defined(WIN32) - int savedTimeZone = 0; /* lint. */ - char *savedTZEnv = NULL; /* lint. */ + TIMEZONE_t savedTimeZone = 0; /* lint. */ + char *savedTZEnv = NULL; /* lint. */ #endif #ifdef HAVE_TZSET diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index d52b7d0..d98e8e4 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.17 2007/04/21 19:52:15 kennykb Exp $ + * RCS: @(#) $Id: tclUnixPort.h,v 1.27.2.18 2007/04/21 22:42:49 kennykb Exp $ */ #ifndef _TCLUNIXPORT @@ -95,6 +95,14 @@ EXTERN Tcl_WideUInt strtoull _ANSI_ARGS_((CONST char *string, # include #endif #include + +#ifdef __CYGWIN__ +# define timezone _timezone + typedef long TIMEZONE_t; +#else /* !__CYGWIN__ */ + typedef int TIMEZONE_t; +#endif /* !__CYGWIN__ */ + #if TIME_WITH_SYS_TIME # include # include -- cgit v0.12