libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* 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.
This commit is contained in:
Danny Smith 2002-12-15 20:55:36 +00:00
parent 2b3ddfcd26
commit ba1ff7c9b8
3 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/w32api/ChangeLog
View File

@ -1,3 +1,11 @@
2002-12-15 Danny Smith <dannysmith@users.sourceforge.net>
* 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.
2002-12-12 Dimitri Papadopoulos <dimitri_at@sourceforge.users.net> 2002-12-12 Dimitri Papadopoulos <dimitri_at@sourceforge.users.net>
* include/oleacc.h (SELFLAG_*): Change to enum. * include/oleacc.h (SELFLAG_*): Change to enum.

9
winsup/w32api/include/windows.h
View File

@ -48,7 +48,7 @@
#include <windef.h> #include <windef.h>
#include <wincon.h> #include <wincon.h>
#include <winbase.h> #include <winbase.h>
#ifndef _WINGDI_H #if !(defined NOGDI || defined _WINGDI_H)
#include <wingdi.h> #include <wingdi.h>
#endif #endif
#ifndef _WINUSER_H #ifndef _WINUSER_H
@ -71,7 +71,6 @@
#endif #endif
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#include <commdlg.h>
#include <cderr.h> #include <cderr.h>
#include <dde.h> #include <dde.h>
#include <ddeml.h> #include <ddeml.h>
@ -83,7 +82,10 @@
#include <rpc.h> #include <rpc.h>
#include <shellapi.h> #include <shellapi.h>
#include <winperf.h> #include <winperf.h>
#ifndef NOGDI
#include <commdlg.h>
#include <winspool.h> #include <winspool.h>
#endif
#if defined(Win32_Winsock) #if defined(Win32_Winsock)
#warning "The Win32_Winsock macro name is deprecated.\ #warning "The Win32_Winsock macro name is deprecated.\
Please use __USE_W32_SOCKETS instead" Please use __USE_W32_SOCKETS instead"
@ -103,11 +105,14 @@
#include <winsock.h> #include <winsock.h>
#endif /* (_WIN32_WINNT >= 0x0400) */ #endif /* (_WIN32_WINNT >= 0x0400) */
#endif #endif
#ifndef NOGDI
#if !defined (__OBJC__) #if !defined (__OBJC__)
#if __GNUC__ >= 3 /* what about Watcom? */ #if __GNUC__ >= 3 /* what about Watcom? */
#include <ole2.h> #include <ole2.h>
#endif #endif
#endif /* __OBJC__ */ #endif /* __OBJC__ */
#endif
#endif /* WIN32_LEAN_AND_MEAN */ #endif /* WIN32_LEAN_AND_MEAN */
#endif /* RC_INVOKED */ #endif /* RC_INVOKED */

40
winsup/w32api/include/winuser.h
View File

@ -2313,6 +2313,7 @@ typedef struct tagHIGHCONTRASTW {
DWORD dwFlags; DWORD dwFlags;
LPWSTR lpszDefaultScheme; LPWSTR lpszDefaultScheme;
} HIGHCONTRASTW,*LPHIGHCONTRASTW; } HIGHCONTRASTW,*LPHIGHCONTRASTW;
#ifndef NOGDI
typedef struct tagICONMETRICSA { typedef struct tagICONMETRICSA {
UINT cbSize; UINT cbSize;
int iHorzSpacing; int iHorzSpacing;
@ -2327,6 +2328,7 @@ typedef struct tagICONMETRICSW {
int iTitleWrap; int iTitleWrap;
LOGFONTW lfFont; LOGFONTW lfFont;
} ICONMETRICSW,*LPICONMETRICSW; } ICONMETRICSW,*LPICONMETRICSW;
#endif /* NOGDI */
typedef struct tagMINIMIZEDMETRICS { typedef struct tagMINIMIZEDMETRICS {
UINT cbSize; UINT cbSize;
int iWidth; int iWidth;
@ -2343,6 +2345,7 @@ typedef struct tagMOUSEKEYS{
DWORD dwReserved1; DWORD dwReserved1;
DWORD dwReserved2; DWORD dwReserved2;
} MOUSEKEYS, *LPMOUSEKEYS; } MOUSEKEYS, *LPMOUSEKEYS;
#ifndef NOGDI
typedef struct tagNONCLIENTMETRICSA { typedef struct tagNONCLIENTMETRICSA {
UINT cbSize; UINT cbSize;
int iBorderWidth; int iBorderWidth;
@ -2377,6 +2380,7 @@ typedef struct tagNONCLIENTMETRICSW {
LOGFONTW lfStatusFont; LOGFONTW lfStatusFont;
LOGFONTW lfMessageFont; LOGFONTW lfMessageFont;
} NONCLIENTMETRICSW,*LPNONCLIENTMETRICSW; } NONCLIENTMETRICSW,*LPNONCLIENTMETRICSW;
#endif
typedef struct tagSERIALKEYSA { typedef struct tagSERIALKEYSA {
UINT cbSize; UINT cbSize;
DWORD dwFlags; DWORD dwFlags;
@ -2742,8 +2746,10 @@ LRESULT WINAPI CallWindowProcA(WNDPROC,HWND,UINT,WPARAM,LPARAM);
LRESULT WINAPI CallWindowProcW(WNDPROC,HWND,UINT,WPARAM,LPARAM); LRESULT WINAPI CallWindowProcW(WNDPROC,HWND,UINT,WPARAM,LPARAM);
WORD WINAPI CascadeWindows(HWND,UINT,LPCRECT,UINT,const HWND*); WORD WINAPI CascadeWindows(HWND,UINT,LPCRECT,UINT,const HWND*);
BOOL WINAPI ChangeClipboardChain(HWND,HWND); BOOL WINAPI ChangeClipboardChain(HWND,HWND);
#ifndef NOGDI
LONG WINAPI ChangeDisplaySettingsA(PDEVMODEA,DWORD); LONG WINAPI ChangeDisplaySettingsA(PDEVMODEA,DWORD);
LONG WINAPI ChangeDisplaySettingsW(PDEVMODEW,DWORD); LONG WINAPI ChangeDisplaySettingsW(PDEVMODEW,DWORD);
#endif
BOOL WINAPI ChangeMenuA(HMENU,UINT,LPCSTR,UINT,UINT); BOOL WINAPI ChangeMenuA(HMENU,UINT,LPCSTR,UINT,UINT);
BOOL WINAPI ChangeMenuW(HMENU,UINT,LPCWSTR,UINT,UINT); BOOL WINAPI ChangeMenuW(HMENU,UINT,LPCWSTR,UINT,UINT);
LPSTR WINAPI CharLowerA(LPSTR); LPSTR WINAPI CharLowerA(LPSTR);
@ -2789,8 +2795,10 @@ HACCEL WINAPI CreateAcceleratorTableA(LPACCEL,int);
HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int); HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int);
BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int); BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int);
HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID); HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID);
#ifndef NOGDI
HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
#endif
#define CreateDialogA(h,n,w,f) CreateDialogParamA(h,n,w,f,0) #define CreateDialogA(h,n,w,f) CreateDialogParamA(h,n,w,f,0)
#define CreateDialogW(h,n,w,f) CreateDialogParamW(h,n,w,f,0) #define CreateDialogW(h,n,w,f) CreateDialogParamW(h,n,w,f,0)
#define CreateDialogIndirectA(h,t,w,f) CreateDialogIndirectParamA(h,t,w,f,0) #define CreateDialogIndirectA(h,t,w,f) CreateDialogIndirectParamA(h,t,w,f,0)
@ -2878,8 +2886,10 @@ BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM);
BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM); BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM);
BOOL WINAPI EnumDesktopWindows(HDESK,ENUMWINDOWSPROC,LPARAM); BOOL WINAPI EnumDesktopWindows(HDESK,ENUMWINDOWSPROC,LPARAM);
BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM); BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
#ifndef NOGDI
BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA); BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA);
BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW); BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW);
#endif
int WINAPI EnumPropsA(HWND,PROPENUMPROCA); int WINAPI EnumPropsA(HWND,PROPENUMPROCA);
int WINAPI EnumPropsW(HWND,PROPENUMPROCW); int WINAPI EnumPropsW(HWND,PROPENUMPROCW);
int WINAPI EnumPropsExA(HWND,PROPENUMPROCEXA,LPARAM); int WINAPI EnumPropsExA(HWND,PROPENUMPROCEXA,LPARAM);
@ -3296,8 +3306,6 @@ typedef MENUITEMINFOW MENUITEMINFO,*LPMENUITEMINFO;
typedef LPCMENUITEMINFOW LPCMENUITEMINFO; typedef LPCMENUITEMINFOW LPCMENUITEMINFO;
typedef MSGBOXPARAMSW MSGBOXPARAMS,*PMSGBOXPARAMS,*LPMSGBOXPARAMS; typedef MSGBOXPARAMSW MSGBOXPARAMS,*PMSGBOXPARAMS,*LPMSGBOXPARAMS;
typedef HIGHCONTRASTW HIGHCONTRAST,*LPHIGHCONTRAST; typedef HIGHCONTRASTW HIGHCONTRAST,*LPHIGHCONTRAST;
typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
typedef SERIALKEYSW SERIALKEYS,*LPSERIALKEYS; typedef SERIALKEYSW SERIALKEYS,*LPSERIALKEYS;
typedef SOUNDSENTRYW SOUNDSENTRY,*LPSOUNDSENTRY; typedef SOUNDSENTRYW SOUNDSENTRY,*LPSOUNDSENTRY;
typedef CREATESTRUCTW CREATESTRUCT, *LPCREATESTRUCT; typedef CREATESTRUCTW CREATESTRUCT, *LPCREATESTRUCT;
@ -3307,7 +3315,6 @@ typedef MULTIKEYHELPW MULTIKEYHELP,*PMULTIKEYHELP,*LPMULTIKEYHELP;
typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX; typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
#define AppendMenu AppendMenuW #define AppendMenu AppendMenuW
#define CallWindowProc CallWindowProcW #define CallWindowProc CallWindowProcW
#define ChangeDisplaySettings ChangeDisplaySettingsW
#define ChangeMenu ChangeMenuW #define ChangeMenu ChangeMenuW
#define CharLower CharLowerW #define CharLower CharLowerW
#define CharLowerBuff CharLowerBuffW #define CharLowerBuff CharLowerBuffW
@ -3321,7 +3328,6 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
#define CharUpperBuff CharUpperBuffW #define CharUpperBuff CharUpperBuffW
#define CopyAcceleratorTable CopyAcceleratorTableW #define CopyAcceleratorTable CopyAcceleratorTableW
#define CreateAcceleratorTable CreateAcceleratorTableW #define CreateAcceleratorTable CreateAcceleratorTableW
#define CreateDesktop CreateDesktopW
#define CreateDialog CreateDialogW #define CreateDialog CreateDialogW
#define CreateDialogIndirect CreateDialogIndirectW #define CreateDialogIndirect CreateDialogIndirectW
#define CreateDialogIndirectParam CreateDialogIndirectParamW #define CreateDialogIndirectParam CreateDialogIndirectParamW
@ -3347,7 +3353,6 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
#define DrawText DrawTextW #define DrawText DrawTextW
#define DrawTextEx DrawTextExW #define DrawTextEx DrawTextExW
#define EnumDesktops EnumDesktopsW #define EnumDesktops EnumDesktopsW
#define EnumDisplaySettings EnumDisplaySettingsW
#define EnumProps EnumPropsW #define EnumProps EnumPropsW
#define EnumPropsEx EnumPropsExW #define EnumPropsEx EnumPropsExW
#define EnumWindowStations EnumWindowStationsW #define EnumWindowStations EnumWindowStationsW
@ -3435,7 +3440,14 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
#define WinHelp WinHelpW #define WinHelp WinHelpW
#define wsprintf wsprintfW #define wsprintf wsprintfW
#define wvsprintf wvsprintfW #define wvsprintf wvsprintfW
#else #ifndef NOGDI
typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
#define ChangeDisplaySettings ChangeDisplaySettingsW
#define CreateDesktop CreateDesktopW
#define EnumDisplaySettings EnumDisplaySettingsW
#endif /* NOGDI */
#else /* UNICODE */
#define EDITWORDBREAKPROC EDITWORDBREAKPROCA #define EDITWORDBREAKPROC EDITWORDBREAKPROCA
#define PROPENUMPROC PROPENUMPROCA #define PROPENUMPROC PROPENUMPROCA
#define PROPENUMPROCEX PROPENUMPROCEXA #define PROPENUMPROCEX PROPENUMPROCEXA
@ -3450,8 +3462,6 @@ typedef MENUITEMINFOA MENUITEMINFO,*LPMENUITEMINFO;
typedef LPCMENUITEMINFOA LPCMENUITEMINFO; typedef LPCMENUITEMINFOA LPCMENUITEMINFO;
typedef MSGBOXPARAMSA MSGBOXPARAMS,*PMSGBOXPARAMS,*LPMSGBOXPARAMS; typedef MSGBOXPARAMSA MSGBOXPARAMS,*PMSGBOXPARAMS,*LPMSGBOXPARAMS;
typedef HIGHCONTRASTA HIGHCONTRAST,*LPHIGHCONTRAST; typedef HIGHCONTRASTA HIGHCONTRAST,*LPHIGHCONTRAST;
typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
typedef SERIALKEYSA SERIALKEYS,*LPSERIALKEYS; typedef SERIALKEYSA SERIALKEYS,*LPSERIALKEYS;
typedef SOUNDSENTRYA SOUNDSENTRY,*LPSOUNDSENTRY; typedef SOUNDSENTRYA SOUNDSENTRY,*LPSOUNDSENTRY;
typedef CREATESTRUCTA CREATESTRUCT, *LPCREATESTRUCT; typedef CREATESTRUCTA CREATESTRUCT, *LPCREATESTRUCT;
@ -3461,7 +3471,6 @@ typedef MULTIKEYHELPA MULTIKEYHELP,*PMULTIKEYHELP,*LPMULTIKEYHELP;
typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX; typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
#define AppendMenu AppendMenuA #define AppendMenu AppendMenuA
#define CallWindowProc CallWindowProcA #define CallWindowProc CallWindowProcA
#define ChangeDisplaySettings ChangeDisplaySettingsA
#define ChangeMenu ChangeMenuA #define ChangeMenu ChangeMenuA
#define CharLower CharLowerA #define CharLower CharLowerA
#define CharLowerBuff CharLowerBuffA #define CharLowerBuff CharLowerBuffA
@ -3475,7 +3484,6 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
#define CharUpperBuff CharUpperBuffA #define CharUpperBuff CharUpperBuffA
#define CopyAcceleratorTable CopyAcceleratorTableA #define CopyAcceleratorTable CopyAcceleratorTableA
#define CreateAcceleratorTable CreateAcceleratorTableA #define CreateAcceleratorTable CreateAcceleratorTableA
#define CreateDesktop CreateDesktopA
#define CreateDialog CreateDialogA #define CreateDialog CreateDialogA
#define CreateDialogIndirect CreateDialogIndirectA #define CreateDialogIndirect CreateDialogIndirectA
#define CreateDialogIndirectParam CreateDialogIndirectParamA #define CreateDialogIndirectParam CreateDialogIndirectParamA
@ -3501,7 +3509,6 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
#define DrawText DrawTextA #define DrawText DrawTextA
#define DrawTextEx DrawTextExA #define DrawTextEx DrawTextExA
#define EnumDesktops EnumDesktopsA #define EnumDesktops EnumDesktopsA
#define EnumDisplaySettings EnumDisplaySettingsA
#define EnumProps EnumPropsA #define EnumProps EnumPropsA
#define EnumPropsEx EnumPropsExA #define EnumPropsEx EnumPropsExA
#define EnumWindowStations EnumWindowStationsA #define EnumWindowStations EnumWindowStationsA
@ -3589,8 +3596,15 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
#define WinHelp WinHelpA #define WinHelp WinHelpA
#define wsprintf wsprintfA #define wsprintf wsprintfA
#define wvsprintf wvsprintfA #define wvsprintf wvsprintfA
#endif #ifndef NOGDI
#endif typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
#define ChangeDisplaySettings ChangeDisplaySettingsA
#define CreateDesktop CreateDesktopA
#define EnumDisplaySettings EnumDisplaySettingsA
#endif /* NOGDI */
#endif /* UNICODE */
#endif /* RC_INVOKED */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif