diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2007-04-21 22:42:47 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2007-04-21 22:42:47 (GMT) |
| commit | 184d051d02dfd8fac7ea89ac7672f3c865b88fdd (patch) | |
| tree | 74f27840a66f878f15af8a6a5360a1b624736860 | |
| parent | 28e10d16ff23e12b9d930dcc0a73140af1265d93 (diff) | |
| download | tcl-184d051d02dfd8fac7ea89ac7672f3c865b88fdd.zip tcl-184d051d02dfd8fac7ea89ac7672f3c865b88fdd.tar.gz tcl-184d051d02dfd8fac7ea89ac7672f3c865b88fdd.tar.bz2 | |
Restored Cygwin buildability [Bug 1387154]
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclClock.c | 6 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 10 |
3 files changed, 15 insertions, 6 deletions
@@ -1,11 +1,12 @@ 2007-04-21 Kevin B. Kenny <kennyb@acm.org> + * 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 <vasiljevic@users.sourceforge.net> 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 <sys/select.h> #endif #include <sys/stat.h> + +#ifdef __CYGWIN__ +# define timezone _timezone + typedef long TIMEZONE_t; +#else /* !__CYGWIN__ */ + typedef int TIMEZONE_t; +#endif /* !__CYGWIN__ */ + #if TIME_WITH_SYS_TIME # include <sys/time.h> # include <time.h> |