summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-05-17 15:08:48 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-05-17 15:08:48 (GMT)
commit2e2a7f14b404980bdc7423407ddb866901ca14a5 (patch)
tree0c3ab2d3a69e70373084c032d1498f40a4b73c96
parentfeb5958816bb507f819c42a0b5b77dc7001a76cd (diff)
downloadtcl-2e2a7f14b404980bdc7423407ddb866901ca14a5.zip
tcl-2e2a7f14b404980bdc7423407ddb866901ca14a5.tar.gz
tcl-2e2a7f14b404980bdc7423407ddb866901ca14a5.tar.bz2
- eliminate compiler warning when compiling with Visual Studio.
- Make sure that _ftime() from msvcrt.dll is used, not ftime() from mingw (which might use 64-bit time_t)
-rw-r--r--generic/tclBasic.c1
-rw-r--r--win/tclWinTime.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 0fd025a..757f9ca 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -19,6 +19,7 @@
# define _USE_32BIT_TIME_T
#endif
+#include <sys/stat.h>
#include "tclInt.h"
#include "tclCompile.h"
#ifndef TCL_GENERIC_ONLY
diff --git a/win/tclWinTime.c b/win/tclWinTime.c
index 8bbd8fd..8fdc071 100644
--- a/win/tclWinTime.c
+++ b/win/tclWinTime.c
@@ -258,7 +258,7 @@ void
Tcl_GetTime(timePtr)
Tcl_Time *timePtr; /* Location to store time information. */
{
- struct timeb t;
+ struct _timeb t;
int useFtime = 1; /* Flag == TRUE if we need to fall back
* on ftime rather than using the perf
@@ -431,7 +431,7 @@ Tcl_GetTime(timePtr)
if ( useFtime ) {
/* High resolution timer is not available. Just use ftime */
- ftime(&t);
+ _ftime(&t);
timePtr->sec = (long)t.time;
timePtr->usec = t.millitm * 1000;
}