From 4cc12c56301d5092226264aa294674f17640448e Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 20 Apr 2004 15:17:36 +0000 Subject: [PATCH] * include/wingdi.h: Protect non-unicode case of below. --- winsup/w32api/ChangeLog | 4 ++++ winsup/w32api/include/wingdi.h | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 8665205ba..98c409609 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,7 @@ +2004-04-20 Christopher Faylor + + * include/wingdi.h: Protect non-unicode case of below. + 2004-04-20 Christopher Faylor * include/wingdi.h: Protect use of ENUMLOGFONTEXDV, PENUMLOGFONTEXDV, diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h index 9c445db3a..7be8a5b29 100644 --- a/winsup/w32api/include/wingdi.h +++ b/winsup/w32api/include/wingdi.h @@ -2952,9 +2952,11 @@ typedef TEXTMETRICA TEXTMETRIC,*PTEXTMETRIC,*LPTEXTMETRIC; #define ICMENUMPROC ICMENUMPROCA #define FONTENUMPROC FONTENUMPROCA typedef DEVMODEA DEVMODE,*PDEVMODE,*LPDEVMODE; -typedef ENUMLOGFONTEXDVA ENUMLOGFONTEXDV; -typedef PENUMLOGFONTEXDVA PENUMLOGFONTEXDV; -typedef LPENUMLOGFONTEXDVA LPENUMLOGFONTEXDV; +#if _WIN32_WINNT >= 0x0500 +typedef ENUMLOGFONTEXDVW ENUMLOGFONTEXDV; +typedef PENUMLOGFONTEXDVW PENUMLOGFONTEXDV; +typedef LPENUMLOGFONTEXDVW LPENUMLOGFONTEXDV; +#endif typedef EXTLOGFONTA EXTLOGFONT,*PEXTLOGFONT,*LPEXTLOGFONT; typedef GCP_RESULTSA GCP_RESULTS,*LPGCP_RESULTS; typedef OUTLINETEXTMETRICA OUTLINETEXTMETRIC,*POUTLINETEXTMETRIC,*LPOUTLINETEXTMETRIC; -- 2.43.5