summaryrefslogtreecommitdiffstats
path: root/generic/tclEnv.c
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2014-06-29 02:20:31 (GMT)
committerKevin B Kenny <kennykb@acm.org>2014-06-29 02:20:31 (GMT)
commit54aa5c1f2d5513d45d1361a3615125a4810cc1c0 (patch)
tree9e84f6c42d0fdc3d3a0958996705d2c2fbb5f722 /generic/tclEnv.c
parent2ac3c16d405d20153ce0ad43f308ff05bc372f7a (diff)
parentc0edc29d67c0944180ce922c7f63d6dd3c3bdf6c (diff)
downloadtcl-54aa5c1f2d5513d45d1361a3615125a4810cc1c0.zip
tcl-54aa5c1f2d5513d45d1361a3615125a4810cc1c0.tar.gz
tcl-54aa5c1f2d5513d45d1361a3615125a4810cc1c0.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclEnv.c')
-rw-r--r--generic/tclEnv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 8f51c1b..cd1a954 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -444,7 +444,7 @@ TclUnsetEnv(
* that no = should be included, and Windows requires it.
*/
-#if defined(__WIN32__) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
string = ckalloc(length + 2);
memcpy(string, name, (size_t) length);
string[length] = '=';
@@ -453,7 +453,7 @@ TclUnsetEnv(
string = ckalloc(length + 1);
memcpy(string, name, (size_t) length);
string[length] = '\0';
-#endif /* WIN32 */
+#endif /* _WIN32 */
Tcl_UtfToExternalDString(NULL, string, -1, &envString);
string = ckrealloc(string, Tcl_DStringLength(&envString) + 1);