From 43fb8fbb0a77aaa6600b55647faff1a55ff39ba2 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 20 Apr 2004 15:10:26 +0000 Subject: * include/wingdi.h: Protect use of ENUMLOGFONTEXDV, PENUMLOGFONTEXDV, LPENUMLOGFONTEXDV with appropriate version check. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/include/wingdi.h | 2 ++ 2 files changed, 7 insertions(+) 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 + + * include/wingdi.h: Protect use of ENUMLOGFONTEXDV, PENUMLOGFONTEXDV, + LPENUMLOGFONTEXDV with appropriate version check. + 2004-04-18 Hans Leidekker * 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; -- cgit v1.2.3