Merge 8.7

1 files changed, 14 insertions, 2 deletions

diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index 5524850..fe99416 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -625,6 +625,16 @@ TclpSetVariables(
  *----------------------------------------------------------------------
  */
 
+#if defined(_WIN32)
+#  define tenviron _wenviron
+#  define tenviron2utfdstr(tenvstr, len, dstr) \
+		Tcl_WinTCharToUtf((TCHAR *)tenvstr, len, dstr)
+#else 
+#  define tenviron environ
+#  define tenviron2utfdstr(tenvstr, len, dstr) \
+		Tcl_ExternalToUtfDString(NULL, tenvstr, len, dstr)
+#endif
+
 size_t
 TclpFindVariable(
     const char *name,		/* Name of desired environment variable
@@ -649,14 +659,16 @@ TclpFindVariable(
     Tcl_UtfToUpper(nameUpper);
 
     Tcl_DStringInit(&envString);
-    for (i = 0, env = environ[i]; env != NULL; i++, env = environ[i]) {
+    for (i = 0, env = (const char *)tenviron[i];
+	env != NULL;
+	i++, env = (const char *)tenviron[i]) {
 	/*
 	 * Chop the env string off after the equal sign, then Convert the name
 	 * to all upper case, so we do not have to convert all the characters
 	 * after the equal sign.
 	 */
 
-	envUpper = Tcl_ExternalToUtfDString(NULL, env, -1, &envString);
+	envUpper = tenviron2utfdstr(env, -1, &envString);
 	p1 = strchr(envUpper, '=');
 	if (p1 == NULL) {
 	    continue;