diff options
author | nijtmans <nijtmans> | 2010-09-18 05:40:30 (GMT) |
---|---|---|
committer | nijtmans <nijtmans> | 2010-09-18 05:40:30 (GMT) |
commit | 016c321c87cc9fca491341c2d72be7f583619c90 (patch) | |
tree | 69d8374e2001743692c8dc3e06ebccd8fefec0f0 /win/tclWinFile.c | |
parent | 03e22d0be578c5b8bd67f3a4deac0feedcaf7f14 (diff) | |
download | tcl-016c321c87cc9fca491341c2d72be7f583619c90.zip tcl-016c321c87cc9fca491341c2d72be7f583619c90.tar.gz tcl-016c321c87cc9fca491341c2d72be7f583619c90.tar.bz2 |
[Bug 3069278]: breakage on head Windows triggered
by install-tzdata. Temporary don't compile this with -DUNICODE, while investigating this bug.
Diffstat (limited to 'win/tclWinFile.c')
-rw-r--r-- | win/tclWinFile.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 4ff3a51..642373b 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -11,10 +11,16 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinFile.c,v 1.109 2010/09/16 18:53:06 hobbs Exp $ + * RCS: @(#) $Id: tclWinFile.c,v 1.110 2010/09/18 05:40:30 nijtmans Exp $ */ -/* #define _WIN32_WINNT 0x0500 */ +/* TODO: This file does not compile in UNICODE mode. + * See [Freq 2965056]: Windows build with -DUNICODE + * and + * [Bug 3069278]: breakage on head Windows triggered by install-tzdata + */ +#undef UNICODE +#undef _UNICODE #include "tclWinInt.h" #include "tclFileSystem.h" @@ -202,7 +208,7 @@ WinLink( const TCHAR *linkTargetPath, int linkAction) { - TCHAR tempFileName[MAX_PATH]; + TCHAR tempFileName[MAX_PATH * 2]; TCHAR *tempFilePart; DWORD attr; @@ -323,7 +329,7 @@ static Tcl_Obj * WinReadLink( const TCHAR *linkSourcePath) { - TCHAR tempFileName[MAX_PATH]; + TCHAR tempFileName[MAX_PATH * 2]; TCHAR *tempFilePart; DWORD attr; @@ -1924,7 +1930,7 @@ TclpGetCwd( Tcl_DString *bufferPtr) /* Uninitialized or free DString filled with * name of current directory. */ { - TCHAR buffer[MAX_PATH]; + TCHAR buffer[MAX_PATH * 2]; char *p; if (tclWinProcs->getCurrentDirectoryProc(MAX_PATH, buffer) == 0) { @@ -2171,7 +2177,7 @@ NativeDev( { int dev; Tcl_DString ds; - TCHAR nativeFullPath[MAX_PATH]; + TCHAR nativeFullPath[MAX_PATH * 2]; TCHAR *nativePart; const char *fullPath; @@ -2345,7 +2351,7 @@ ClientData TclpGetNativeCwd( ClientData clientData) { - TCHAR buffer[MAX_PATH]; + TCHAR buffer[MAX_PATH * 2]; if (tclWinProcs->getCurrentDirectoryProc(MAX_PATH, buffer) == 0) { TclWinConvertError(GetLastError()); @@ -2463,7 +2469,7 @@ TclpFilesystemPathType( { #define VOL_BUF_SIZE 32 int found; - TCHAR volType[VOL_BUF_SIZE]; + TCHAR volType[VOL_BUF_SIZE * 2]; char *firstSeparator; const char *path; Tcl_Obj *normPath = Tcl_FSGetNormalizedPath(NULL, pathPtr); |