ba6aad1d73
(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.
39 lines
1.2 KiB
C
39 lines
1.2 KiB
C
/* winlean.h - Standard "lean" windows include
|
|
|
|
Copyright 2010, 2011 Red Hat, Inc.
|
|
|
|
This file is part of Cygwin.
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
details. */
|
|
|
|
#ifndef _WINLEAN_H
|
|
#define _WINLEAN_H 1
|
|
#define WIN32_LEAN_AND_MEAN 1
|
|
#define _WINGDI_H
|
|
#define _WINUSER_H
|
|
#define _WINNLS_H
|
|
#define _WINVER_H
|
|
#define _WINNETWK_H
|
|
#define _WINSVC_H
|
|
#include <windows.h>
|
|
#include <wincrypt.h>
|
|
#include <lmcons.h>
|
|
#include <ntdef.h>
|
|
#undef _WINGDI_H
|
|
#undef _WINUSER_H
|
|
#undef _WINNLS_H
|
|
#undef _WINVER_H
|
|
#undef _WINNETWK_H
|
|
#undef _WINSVC_H
|
|
/* 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 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*/
|