diff options
Diffstat (limited to 'winsup/cygwin/winlean.h')
-rw-r--r-- | winsup/cygwin/winlean.h | 65 |
1 files changed, 1 insertions, 64 deletions
diff --git a/winsup/cygwin/winlean.h b/winsup/cygwin/winlean.h index aa092ee53..d2d7f7a56 100644 --- a/winsup/cygwin/winlean.h +++ b/winsup/cygwin/winlean.h @@ -1,6 +1,6 @@ /* winlean.h - Standard "lean" windows include - Copyright 2010, 2011, 2012 Red Hat, Inc. + Copyright 2010, 2011 Red Hat, Inc. This file is part of Cygwin. @@ -11,85 +11,22 @@ details. */ #ifndef _WINLEAN_H #define _WINLEAN_H 1 #define WIN32_LEAN_AND_MEAN 1 - -/* Mingw32 */ #define _WINGDI_H #define _WINUSER_H #define _WINNLS_H #define _WINVER_H #define _WINNETWK_H #define _WINSVC_H -/* Mingw64 */ -#define _WINNLS_ -#define _WINNETWK_ -#define _WINSVC_ -#define _ADVAPI32_ -#define _DSGETDCAPI_ -#define _GDI32_ -#define _KERNEL32_ -#define _OLE32_ -#define _SHELL32_ -#define _SPOOL32_ -#define _USER32_ -#define _WINMM_ -#define WINIMPM -#define WINSOCK_API_LINKAGE -#define NTDDI_VERSION 0x6020000 /* Probably should just be derived from our - _WIN32_WINNT setting in winsup.h */ - -/* Windows headers define a couple of annoyingly intrusive macros for the - sole purpose of inline documentation. Since they are defined without - respect for the namespace and not undef'ed anymore, they tend to collide - with otherwise innocent definitions in the application. We check if they - exist and if not, we undef them again after including the Windows headers. */ -#ifndef IN -#define __undef_IN -#endif -#ifndef OUT -#define __undef_OUT -#endif -#ifndef OPTIONAL -#define __undef_OPTIONAL -#endif -#ifndef NOTHING -#define __undef_NOTHING -#endif -#ifndef CRITICAL -#define __undef_CRITICAL -#endif - #include <windows.h> #include <wincrypt.h> #include <lmcons.h> #include <ntdef.h> - -#ifdef __undef_IN -#undef IN -#endif -#ifdef __undef_OUT -#undef OUT -#endif -#ifdef __undef_OPTIONAL -#undef OPTIONAL -#endif -#ifdef __undef_NOTHING -#undef NOTHING -#endif -#ifdef __undef_CRITICAL -#undef CRITICAL -#endif - #undef _WINGDI_H #undef _WINUSER_H #undef _WINNLS_H #undef _WINVER_H #undef _WINNETWK_H #undef _WINSVC_H - -#undef _WINNLS_ -#undef _WINNETWK_ -#undef _WINSVC_ - /* 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 |