diff options
| author | Christopher Faylor <me@cgf.cx> | 2004-04-20 19:17:36 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2004-04-20 19:17:36 +0400 |
| commit | 4cc12c56301d5092226264aa294674f17640448e (patch) | |
| tree | e962322d029aeb3c0bd13d7d6ee61ff1c7fd096c /winsup/w32api | |
| parent | 43fb8fbb0a77aaa6600b55647faff1a55ff39ba2 (diff) | |
* include/wingdi.h: Protect non-unicode case of below.
Diffstat (limited to 'winsup/w32api')
| -rw-r--r-- | winsup/w32api/ChangeLog | 4 | ||||
| -rw-r--r-- | 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,5 +1,9 @@ 2004-04-20 Christopher Faylor <cgf@alum.bu.edu> + * include/wingdi.h: Protect non-unicode case of below. + +2004-04-20 Christopher Faylor <cgf@alum.bu.edu> + * include/wingdi.h: Protect use of ENUMLOGFONTEXDV, PENUMLOGFONTEXDV, LPENUMLOGFONTEXDV with appropriate version check. 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; |