diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-04-19 14:15:09 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-04-19 14:15:09 +0400 |
| commit | ba6aad1d735126cd0e0e9c114ba3389a78779008 (patch) | |
| tree | c239126e34020cf0bac1a0d1f76596ee8bca1dcf /winsup/cygwin/fhandler_console.cc | |
| parent | b18cb86be7509b4125732f2b25ff3a6e5f423fa2 (diff) | |
* autoload.cc (GetConsoleWindow): Drop.
(GetSystemWindowsDirectoryW): Drop.
* fhandler_console.cc (beep): Call GetSystemWindowsDirectoryW instead of
GetWindowsDirectoryW.
* uinfo.cc (cygheap_user::env_systemroot): Call
GetSystemWindowsDirectoryW and convert to multibyte on the fly.
* winlean.h (GetWindowsDirectoryW): Redefine to something invalid.
Explain why.
Diffstat (limited to 'winsup/cygwin/fhandler_console.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_console.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 8ce82e481..456336c65 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -67,9 +67,9 @@ beep () if (r.created ()) { PWCHAR buf = NULL; - UINT len = GetWindowsDirectoryW (buf, 0) * sizeof (WCHAR); + UINT len = GetSystemWindowsDirectoryW (buf, 0) * sizeof (WCHAR); buf = (PWCHAR) alloca (len += sizeof (ding)); - UINT res = GetWindowsDirectoryW (buf, len); + UINT res = GetSystemWindowsDirectoryW (buf, len); if (res && res <= len) r.set_string (L"", wcscat (buf, ding)); } |