# HG changeset patch # User Steve Dower # Date 1416693263 28800 # Sat Nov 22 13:54:23 2014 -0800 # Node ID 52cb61712d2530fb62f008a3deba7828256512f9 # Parent 7ab3542a9f72e3a27ffa38b9534da9370df1b77a Applied fixups diff --git a/e_os.h b/e_os.h --- a/e_os.h +++ b/e_os.h @@ -306,8 +306,8 @@ # undef isupper # undef isxdigit # endif -# if defined(_MSC_VER) && !defined(_DLL) && defined(stdin) -# if _MSC_VER>=1300 +# if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin) +# if _MSC_VER>=1300 && _MSC_VER<1600 # undef stdin # undef stdout # undef stderr @@ -315,7 +315,7 @@ # define stdin (&__iob_func()[0]) # define stdout (&__iob_func()[1]) # define stderr (&__iob_func()[2]) -# elif defined(I_CAN_LIVE_WITH_LNK4049) +# elif _MSC_VER<1300 && defined(I_CAN_LIVE_WITH_LNK4049) # undef stdin # undef stdout # undef stderr diff --git a/tclWinTime.c b/tclWinTime.c --- a/tclWinTime.c +++ b/tclWinTime.c @@ -542,7 +542,7 @@ return TclpLocaltime(t); } - time = *t - timezone; + time = *t - _timezone; /* * If we aren't near to overflowing the long, just add the bias and @@ -562,7 +562,7 @@ * Propagate seconds overflow into minutes, hours and days. */ - time = tmPtr->tm_sec - timezone; + time = tmPtr->tm_sec - _timezone; tmPtr->tm_sec = (int)(time % 60); if (tmPtr->tm_sec < 0) { tmPtr->tm_sec += 60; diff --git a/tclrules.vc b/tclrules.vc --- a/tclrules.vc +++ b/tclrules.vc @@ -68,7 +68,7 @@ && ![echo $(_HASH)endif >> vercl.x] \ && ![cl -nologo -TC -P vercl.x $(ERRNULL)] !include vercl.i -!if ![echo VCVER= ^\> vercl.vc] \ +!if ![> vercl.vc echo VCVER= ^\&> nul echo.] \ && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] !include vercl.vc !endif @@ -532,37 +532,37 @@ !if [echo REM = This file is generated from rules.vc > versions.vc] !endif -!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \ +!if [>> versions.vc echo TCL_MAJOR_VERSION = \&>nul echo.] \ && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc] !endif -!if [echo TCL_MINOR_VERSION = \>> versions.vc] \ +!if [>> versions.vc echo TCL_MINOR_VERSION = \&>nul echo.] \ && [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc] !endif -!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \ +!if [>> versions.vc echo TCL_PATCH_LEVEL = \&>nul echo.] \ && [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc] !endif # If building the tcl core then we need additional package versions !if "$(PROJECT)" == "tcl" -!if [echo PKG_HTTP_VER = \>> versions.vc] \ +!if [>> versions.vc echo PKG_HTTP_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc] !endif -!if [echo PKG_TCLTEST_VER = \>> versions.vc] \ +!if [>> versions.vc echo PKG_TCLTEST_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc] !endif -!if [echo PKG_MSGCAT_VER = \>> versions.vc] \ +!if [>> versions.vc echo PKG_MSGCAT_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\msgcat\pkgIndex.tcl msgcat >> versions.vc] !endif -!if [echo PKG_PLATFORM_VER = \>> versions.vc] \ +!if [>> versions.vc echo PKG_PLATFORM_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform " >> versions.vc] !endif -!if [echo PKG_SHELL_VER = \>> versions.vc] \ +!if [>> versions.vc echo PKG_SHELL_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform::shell" >> versions.vc] !endif -!if [echo PKG_DDE_VER = \>> versions.vc] \ +!if [>> versions.vc echo PKG_DDE_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc] !endif -!if [echo PKG_REG_VER =\>> versions.vc] \ +!if [>> versions.vc echo PKG_REG_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc] !endif !endif @@ -651,13 +651,13 @@ !if defined(PROJECT_REQUIRES_TK) || "$(PROJECT)" == "tk" -!if [echo TK_MAJOR_VERSION = \>> versions.vc] \ +!if [>> versions.vc echo TK_MAJOR_VERSION = \&>nul echo.] \ && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc] !endif -!if [echo TK_MINOR_VERSION = \>> versions.vc] \ +!if [>> versions.vc echo TK_MINOR_VERSION = \&>nul echo.] \ && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc] !endif -!if [echo TK_PATCH_LEVEL = \>> versions.vc] \ +!if [>> versions.vc echo TK_PATCH_LEVEL = \&>nul echo.] \ && [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc] !endif diff --git a/tkrules.vc b/tkrules.vc --- a/tkrules.vc +++ b/tkrules.vc @@ -68,7 +68,7 @@ && ![echo $(_HASH)endif >> vercl.x] \ && ![cl -nologo -TC -P vercl.x $(ERRNULL)] !include vercl.i -!if ![echo VCVER= ^\> vercl.vc] \ +!if ![> vercl.vc echo VCVER= ^\&>nul echo.] \ && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] !include vercl.vc !endif @@ -532,37 +532,37 @@ !if [echo REM = This file is generated from rules.vc > versions.vc] !endif -!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \ +!if [>>versions.vc echo TCL_MAJOR_VERSION = \&>nul echo.] \ && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc] !endif -!if [echo TCL_MINOR_VERSION = \>> versions.vc] \ +!if [>>versions.vc echo TCL_MINOR_VERSION = \&>nul echo.] \ && [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc] !endif -!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \ +!if [>>versions.vc echo TCL_PATCH_LEVEL = \&>nul echo.] \ && [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc] !endif # If building the tcl core then we need additional package versions !if "$(PROJECT)" == "tcl" -!if [echo PKG_HTTP_VER = \>> versions.vc] \ +!if [>>versions.vc echo PKG_HTTP_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc] !endif -!if [echo PKG_TCLTEST_VER = \>> versions.vc] \ +!if [>>versions.vc echo PKG_TCLTEST_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc] !endif -!if [echo PKG_MSGCAT_VER = \>> versions.vc] \ +!if [>>versions.vc echo PKG_MSGCAT_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\msgcat\pkgIndex.tcl msgcat >> versions.vc] !endif -!if [echo PKG_PLATFORM_VER = \>> versions.vc] \ +!if [>>versions.vc echo PKG_PLATFORM_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform " >> versions.vc] !endif -!if [echo PKG_SHELL_VER = \>> versions.vc] \ +!if [>>versions.vc echo PKG_SHELL_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform::shell" >> versions.vc] !endif -!if [echo PKG_DDE_VER = \>> versions.vc] \ +!if [>>versions.vc echo PKG_DDE_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc] !endif -!if [echo PKG_REG_VER =\>> versions.vc] \ +!if [>> versions.vc echo PKG_REG_VER = \&>nul echo.] \ && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc] !endif !endif @@ -657,13 +657,13 @@ !if defined(PROJECT_REQUIRES_TK) || "$(PROJECT)" == "tk" -!if [echo TK_MAJOR_VERSION = \>> versions.vc] \ +!if [>>versions.vc echo TK_MAJOR_VERSION = \&>nul echo.] \ && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc] !endif -!if [echo TK_MINOR_VERSION = \>> versions.vc] \ +!if [>>versions.vc echo TK_MINOR_VERSION = \&>nul echo.] \ && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc] !endif -!if [echo TK_PATCH_LEVEL = \>> versions.vc] \ +!if [>>versions.vc echo TK_PATCH_LEVEL = \&>nul echo.] \ && [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc] !endif