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/winlean.h | |
| 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/winlean.h')
| -rw-r--r-- | winsup/cygwin/winlean.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/winsup/cygwin/winlean.h b/winsup/cygwin/winlean.h index c4955aec4..d2d7f7a56 100644 --- a/winsup/cygwin/winlean.h +++ b/winsup/cygwin/winlean.h @@ -30,8 +30,9 @@ details. */ /* When Terminal Services are installed, the GetWindowsDirectory function does not return the system installation dir, but a user specific directory instead. That's not what we have in mind when calling GetWindowsDirectory - from within Cygwin. So we redefine GetWindowsDirectory to call the - GetSystemWindowsDirectory function here. */ -#define GetWindowsDirectoryW GetSystemWindowsDirectoryW -#define GetWindowsDirectoryA GetSystemWindowsDirectoryA + from within Cygwin. So we redefine GetWindowsDirectory to something + invalid here to avoid that it's called accidentally in Cygwin. Don't + use this function. Use GetSystemWindowsDirectoryW. */ +#define GetWindowsDirectoryW dont_use_GetWindowsDirectory +#define GetWindowsDirectoryA dont_use_GetWindowsDirectory #endif /*_WINLEAN_H*/ |