diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-07-17 21:22:22 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-07-17 21:22:22 (GMT) |
| commit | 5234a59846f046760830b06488e2d214d0b2cf04 (patch) | |
| tree | eb303b04e47fe05468dc5620171a0ee2c8453095 /generic/tclFCmd.c | |
| parent | 2fc3c8d6596a5d180b7f2c13451e8ec26144cb2b (diff) | |
| parent | ad86656b196a9b34f2df43327c816d8099d7f3c8 (diff) | |
| download | tcl-5234a59846f046760830b06488e2d214d0b2cf04.zip tcl-5234a59846f046760830b06488e2d214d0b2cf04.tar.gz tcl-5234a59846f046760830b06488e2d214d0b2cf04.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclFCmd.c')
| -rw-r--r-- | generic/tclFCmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c index 13377d3..8bf0a5a 100644 --- a/generic/tclFCmd.c +++ b/generic/tclFCmd.c @@ -517,7 +517,7 @@ CopyRenameOneFile( * 16 bits and we get collisions. See bug #2015723. */ -#if !defined(WIN32) && !defined(__CYGWIN__) +#if !defined(_WIN32) && !defined(__CYGWIN__) if ((sourceStatBuf.st_ino != 0) && (targetStatBuf.st_ino != 0)) { if ((sourceStatBuf.st_ino == targetStatBuf.st_ino) && (sourceStatBuf.st_dev == targetStatBuf.st_dev)) { @@ -1196,7 +1196,7 @@ TclFileLinkCmd( static const char *const linkTypes[] = { "-symbolic", "-hard", NULL }; - if (Tcl_GetIndexFromObj(interp, objv[1], linkTypes, "switch", 0, + if (Tcl_GetIndexFromObj(interp, objv[1], linkTypes, "option", 0, &linkAction) != TCL_OK) { return TCL_ERROR; } |