diff options
author | Kevin B Kenny <kennykb@acm.org> | 2010-09-22 01:08:49 (GMT) |
---|---|---|
committer | Kevin B Kenny <kennykb@acm.org> | 2010-09-22 01:08:49 (GMT) |
commit | b915b5fe069f09a9bd7dec58b31623b29133be2f (patch) | |
tree | 6a13b2ab5f2e5e8d8efdb0e725da6876b66445ad /win/tclWinFile.c | |
parent | 53ebe37f0445f1a132bd20729d41894c6470622a (diff) | |
download | tcl-b915b5fe069f09a9bd7dec58b31623b29133be2f.zip tcl-b915b5fe069f09a9bd7dec58b31623b29133be2f.tar.gz tcl-b915b5fe069f09a9bd7dec58b31623b29133be2f.tar.bz2 |
merge changes from HEAD
Diffstat (limited to 'win/tclWinFile.c')
-rw-r--r-- | win/tclWinFile.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 98c9fc2..bd98a1a 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.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: tclWinFile.c,v 1.112 2010/09/20 14:28:13 nijtmans Exp $ + * RCS: @(#) $Id: tclWinFile.c,v 1.112.2.1 2010/09/22 01:08:49 kennykb Exp $ */ #include "tclWinInt.h" @@ -1885,6 +1885,7 @@ TclpGetCwd( { TCHAR buffer[MAX_PATH]; char *p; + WCHAR *native; if (tclWinProcs->getCurrentDirectoryProc(MAX_PATH, buffer) == 0) { TclWinConvertError(GetLastError()); @@ -1899,7 +1900,7 @@ TclpGetCwd( * Watch for the weird Windows c:\\UNC syntax. */ - WCHAR *native = (WCHAR *) buffer; + native = (WCHAR *) buffer; if ((native[0] != '\0') && (native[1] == ':') && (native[2] == '\\') && (native[3] == '\\')) { native += 2; |