diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2002-12-15 20:55:36 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2002-12-15 20:55:36 +0000 |
| commit | ba1ff7c9b86d927a65b920b4f982b34a1f547f62 (patch) | |
| tree | 12151c2b3c826da2cfcd334ac1366fed454e02bb /winsup/w32api/include/windows.h | |
| parent | 2b3ddfcd268e19b5c1bc342d140c83cbde93a680 (diff) | |
| download | cygnal-ba1ff7c9b86d927a65b920b4f982b34a1f547f62.tar.gz cygnal-ba1ff7c9b86d927a65b920b4f982b34a1f547f62.tar.bz2 cygnal-ba1ff7c9b86d927a65b920b4f982b34a1f547f62.zip | |
* include/windows.h: Guard inclusion of wingdi.h,
commdlg.h, winspool.h, ole2.h with NOGDI.
* include/winuser.h (ICONMETRICS, NONCLIENTMETRICS,
ChangeDisplaySettings, CreateDesktop, EnumDisplaySettings):
Guard with NOGDI.
Diffstat (limited to 'winsup/w32api/include/windows.h')
| -rw-r--r-- | winsup/w32api/include/windows.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h index e7d00b423..38a139103 100644 --- a/winsup/w32api/include/windows.h +++ b/winsup/w32api/include/windows.h @@ -48,7 +48,7 @@ #include <windef.h> #include <wincon.h> #include <winbase.h> -#ifndef _WINGDI_H +#if !(defined NOGDI || defined _WINGDI_H) #include <wingdi.h> #endif #ifndef _WINUSER_H @@ -71,7 +71,6 @@ #endif #ifndef WIN32_LEAN_AND_MEAN -#include <commdlg.h> #include <cderr.h> #include <dde.h> #include <ddeml.h> @@ -83,7 +82,10 @@ #include <rpc.h> #include <shellapi.h> #include <winperf.h> +#ifndef NOGDI +#include <commdlg.h> #include <winspool.h> +#endif #if defined(Win32_Winsock) #warning "The Win32_Winsock macro name is deprecated.\ Please use __USE_W32_SOCKETS instead" @@ -103,11 +105,14 @@ #include <winsock.h> #endif /* (_WIN32_WINNT >= 0x0400) */ #endif +#ifndef NOGDI #if !defined (__OBJC__) #if __GNUC__ >= 3 /* what about Watcom? */ #include <ole2.h> #endif #endif /* __OBJC__ */ +#endif + #endif /* WIN32_LEAN_AND_MEAN */ #endif /* RC_INVOKED */ |