From ba6aad1d735126cd0e0e9c114ba3389a78779008 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 19 Apr 2011 10:15:09 +0000 Subject: * 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. --- winsup/cygwin/winlean.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'winsup/cygwin/winlean.h') 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*/ -- cgit v1.2.3