aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/environ.cc3
2 files changed, 7 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index befc5c9..d3f906f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-04 Corinna Vinschen <corinna@vinschen.de>
+
+ * environ.cc (spenvs): Add "windir" as an "always export" variable
+ to accomodate WinSock on Windows 95.
+
2005-12-02 Christopher Faylor <cgf@timesys.com>
* include/exceptions.h (exception_list): Revert previous change.
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index dceac85..e7bd292 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -880,7 +880,8 @@ static NO_COPY spenv spenvs[] =
{NL ("SYSTEMROOT="), true, true, &cygheap_user::env_systemroot},
{NL ("USERDOMAIN="), false, false, &cygheap_user::env_domain},
{NL ("USERNAME="), false, false, &cygheap_user::env_name},
- {NL ("USERPROFILE="), false, false, &cygheap_user::env_userprofile}
+ {NL ("USERPROFILE="), false, false, &cygheap_user::env_userprofile},
+ {NL ("windir="), true, true, &cygheap_user::env_systemroot}
};
char *