diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-11-16 10:12:05 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-11-16 10:12:05 (GMT) |
| commit | d82bd0ad8d88a2f44c08c6689823a5d53d888e44 (patch) | |
| tree | 38d09973843ea0813935bd32c8d11e34b88f8a0e /win | |
| parent | ba0f4e5c1831f33002465cead9a984383aa6da82 (diff) | |
| parent | 1e8c676e12346c0db746226bcf3be0d74db2b967 (diff) | |
| download | tcl-d82bd0ad8d88a2f44c08c6689823a5d53d888e44.zip tcl-d82bd0ad8d88a2f44c08c6689823a5d53d888e44.tar.gz tcl-d82bd0ad8d88a2f44c08c6689823a5d53d888e44.tar.bz2 | |
Merge trunk
<p>Fix Windows build
<p>Now usable with Thread's "novem" branch (3.0a1)
<p>Remove some more deprecated stuff
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 8 | ||||
| -rw-r--r-- | win/tclAppInit.c | 2 | ||||
| -rw-r--r-- | win/tclWinSerial.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/win/configure b/win/configure index 0258898..ba10113 100755 --- a/win/configure +++ b/win/configure @@ -1308,10 +1308,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # /bin/sh. The bash shell seems to suffer from some strange failures. SHELL=/bin/sh -TCL_VERSION=8.6 -TCL_MAJOR_VERSION=8 -TCL_MINOR_VERSION=6 -TCL_PATCH_LEVEL="b3" +TCL_VERSION=9.0 +TCL_MAJOR_VERSION=9 +TCL_MINOR_VERSION=0 +TCL_PATCH_LEVEL="a0" VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION TCL_DDE_VERSION=1.4 diff --git a/win/tclAppInit.c b/win/tclAppInit.c index 299f42b..56f45a0 100644 --- a/win/tclAppInit.c +++ b/win/tclAppInit.c @@ -1,4 +1,4 @@ - +/* * tclAppInit.c -- * * Provides a default version of the main program and Tcl_AppInit diff --git a/win/tclWinSerial.c b/win/tclWinSerial.c index 9e9d1af..458b05b 100644 --- a/win/tclWinSerial.c +++ b/win/tclWinSerial.c @@ -376,7 +376,7 @@ SerialGetMilliseconds(void) { Tcl_Time time; - TclpGetTime(&time); + Tcl_GetTime(&time); return (time.sec * 1000 + time.usec / 1000); } |