diff options
| author | Christopher Faylor <me@cgf.cx> | 2004-04-20 19:10:26 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2004-04-20 19:10:26 +0400 |
| commit | 43fb8fbb0a77aaa6600b55647faff1a55ff39ba2 (patch) | |
| tree | 2cd70aeb20f0a917c4ee139b5d22e54acdd61204 /winsup/w32api | |
| parent | 5a238b6d943dde28e90c153cf4f9969d6339e978 (diff) | |
* include/wingdi.h: Protect use of ENUMLOGFONTEXDV, PENUMLOGFONTEXDV,
LPENUMLOGFONTEXDV with appropriate version check.
Diffstat (limited to 'winsup/w32api')
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/wingdi.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 834e04483..8665205ba 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2004-04-20 Christopher Faylor <cgf@alum.bu.edu> + + * include/wingdi.h: Protect use of ENUMLOGFONTEXDV, PENUMLOGFONTEXDV, + LPENUMLOGFONTEXDV with appropriate version check. + 2004-04-18 Hans Leidekker <hans@it.vu.nl> * lib/directx/dxguid.c (CLSID_DirectSoundPrivate, diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h index a4324b699..9c445db3a 100644 --- a/winsup/w32api/include/wingdi.h +++ b/winsup/w32api/include/wingdi.h @@ -2878,9 +2878,11 @@ typedef TEXTMETRICW TEXTMETRIC,*PTEXTMETRIC,*LPTEXTMETRIC; #define ICMENUMPROC ICMENUMPROCW #define FONTENUMPROC FONTENUMPROCW typedef DEVMODEW DEVMODE,*PDEVMODE,*LPDEVMODE; +#if _WIN32_WINNT >= 0x0500 typedef ENUMLOGFONTEXDVW ENUMLOGFONTEXDV; typedef PENUMLOGFONTEXDVW PENUMLOGFONTEXDV; typedef LPENUMLOGFONTEXDVW LPENUMLOGFONTEXDV; +#endif typedef EXTLOGFONTW EXTLOGFONT,*PEXTLOGFONT,*LPEXTLOGFONT; typedef GCP_RESULTSW GCP_RESULTS,*LPGCP_RESULTS; typedef OUTLINETEXTMETRICW OUTLINETEXTMETRIC,*POUTLINETEXTMETRIC,*LPOUTLINETEXTMETRIC; |