summaryrefslogtreecommitdiffstats
path: root/generic/tclPathObj.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-02-11 11:13:41 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-02-11 11:13:41 (GMT)
commitec480d44aa09883115b0d541f6dfeec2ed09155f (patch)
tree18a830ba043d5f055ec49cea156699b3794688eb /generic/tclPathObj.c
parentc05fbe8cf9ce62d0d061610ca3200c26dc12f3e8 (diff)
parent67d68fe341c4c825148b48d7fd74d2136ac8fa6a (diff)
downloadtcl-ec480d44aa09883115b0d541f6dfeec2ed09155f.zip
tcl-ec480d44aa09883115b0d541f6dfeec2ed09155f.tar.gz
tcl-ec480d44aa09883115b0d541f6dfeec2ed09155f.tar.bz2
Merge trunk
Diffstat (limited to 'generic/tclPathObj.c')
-rw-r--r--generic/tclPathObj.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index ea5c1b8..7a3cf58 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -512,7 +512,7 @@ TclFSGetPathType(
if (PATHFLAGS(pathPtr) == 0) {
/* The path is not absolute... */
-#ifdef __WIN32__
+#ifdef _WIN32
/* ... on Windows we must make another call to determine whether
* it's relative or volumerelative [Bug 2571597]. */
return TclGetPathType(pathPtr, filesystemPtrPtr, driveNameLengthPtr,
@@ -1956,7 +1956,7 @@ Tcl_FSGetNormalizedPath(
/*
* We have a refCount on the cwd.
*/
-#ifdef __WIN32__
+#ifdef _WIN32
} else if (type == TCL_PATH_VOLUME_RELATIVE) {
/*
* Only Windows has volume-relative paths.
@@ -1969,7 +1969,7 @@ Tcl_FSGetNormalizedPath(
return NULL;
}
pureNormalized = 0;
-#endif /* __WIN32__ */
+#endif /* _WIN32 */
}
}