summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authormdejong <mdejong>2003-01-14 02:06:10 (GMT)
committermdejong <mdejong>2003-01-14 02:06:10 (GMT)
commit34dbae7d6c29485684a2de0432b01702ce074d54 (patch)
tree023efb988c8483959418c28474b1c576859a43d1 /generic
parentbcfd8c29092de21e66b7a7ca7a9a682b07514c54 (diff)
downloadtcl-34dbae7d6c29485684a2de0432b01702ce074d54.zip
tcl-34dbae7d6c29485684a2de0432b01702ce074d54.tar.gz
tcl-34dbae7d6c29485684a2de0432b01702ce074d54.tar.bz2
Fix mingw build problems and compiler warnings.
* generic/tcl.h: Add if defined(__MINGW32__) check to code that sets the TCL_WIDE_INT_TYPE and TCL_LL_MODIFIER. * generic/tclClock.c (FormatClock): Don't define savedTimeZone and savedTZEnv if we are not going to use them. * generic/tclEnv.c: Add cast to avoid warning. * win/tclWinChan.c: Use DWORD instead of int to avoid compiler warning. * win/tclWinThrd.c: Only define allocLock, allocLockPtr, and dataKey when TCL_THREADS is defined. This avoid a compiler warning about unused variables.
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.h4
-rw-r--r--generic/tclClock.c4
-rw-r--r--generic/tclEnv.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index b89bb59..7a6fd2a 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tcl.h,v 1.149 2003/01/13 07:01:06 mdejong Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.150 2003/01/14 02:06:10 mdejong Exp $
*/
#ifndef _TCL
@@ -353,7 +353,7 @@ typedef long LONG;
*/
#if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG)
-# ifdef __CYGWIN__
+# if defined(__CYGWIN__) || defined(__MINGW32__)
# define TCL_WIDE_INT_TYPE long long
# define TCL_LL_MODIFIER "L"
typedef struct stat Tcl_StatBuf;
diff --git a/generic/tclClock.c b/generic/tclClock.c
index 549cc0a..774f72a 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.16 2002/07/05 11:16:01 rmax Exp $
+ * RCS: @(#) $Id: tclClock.c,v 1.17 2003/01/14 02:06:11 mdejong Exp $
*/
#include "tcl.h"
@@ -263,7 +263,7 @@ FormatClock(interp, clockVal, useGMT, format)
char *p;
int result;
time_t tclockVal;
-#ifndef HAVE_TM_ZONE
+#if defined(HAVE_TM_ZONE) && !defined(WIN32)
int savedTimeZone = 0; /* lint. */
char *savedTZEnv = NULL; /* lint. */
#endif
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index e0e2739..1d6e66f 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -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: tclEnv.c,v 1.19 2002/10/14 22:25:10 hobbs Exp $
+ * RCS: @(#) $Id: tclEnv.c,v 1.20 2003/01/14 02:06:11 mdejong Exp $
*/
#include "tclInt.h"
@@ -409,7 +409,7 @@ TclUnsetEnv(name)
*/
#ifdef USE_PUTENV
- string = ckalloc(length+2);
+ string = ckalloc((unsigned int) length+2);
memcpy((VOID *) string, (VOID *) name, (size_t) length);
string[length] = '=';
string[length+1] = '\0';