* include/wingdi.h: Protect use of ENUMLOGFONTEXDV, PENUMLOGFONTEXDV,

LPENUMLOGFONTEXDV with appropriate version check.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 834e044..8665205 100644 (file)
--- 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 a4324b6..9c445db 100644 (file)
--- 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;