wingdi.h (ENUMLOGFONTEXDV[AW]): breaks Cygwin (fwd)

[Brian Ford]

I sent this to mingw-patches yesterday, but it got stuck waiting on
moderator approval because I am not subscribed.  As such, I thought I'd
forward it here as well.

I assume mingw-patches is the preferred list for w32api patches?  Does
anyone know if there is a subscribe for posting only option?  Thanks.

-- 
Brian Ford
Senior Realtime Software Engineer
VITAL - Visual Simulation Systems
FlightSafety International
Phone: 314-551-8460
Fax:   314-551-8444

---------- Forwarded message ----------
Date: Mon, 19 Apr 2004 17:43:48 -0500
To: mingw-patches=lists.sourceforge.net
Cc: Filip Navara <xnavara=volny.cz>
Subject: wingdi.h (ENUMLOGFONTEXDV[AW]): breaks Cygwin

2004-04-19  Brian Ford  <ford@vss.fsi.com>

	* include/wingdi.h (ENUMLOGFONTEXDV[AW]): Only define if
	_WIN32_WINNT >= 0x0500.

gcc -L/home/ford/downloads/cygb2/i686-pc-cygwin/winsup
-L/home/ford/downloads/cygb2/i686-pc-cygwin/winsup/cygwin
-L/home/ford/downloads/cygb2/i686-pc-cygwin/winsup/w32api/lib -isystem
/home/ford/downloads/cygwin/winsup/include -isystem
/home/ford/downloads/cygwin/winsup/cygwin/include -isystem
/home/ford/downloads/cygwin/winsup/w32api/include
-B/home/ford/downloads/cygb2/i686-pc-cygwin/newlib/ -isystem
/home/ford/downloads/cygb2/i686-pc-cygwin/newlib/targ-include -isystem
/home/ford/downloads/cygwin/newlib/libc/include -c -O2 -g -O2
-I../../../../../cygwin/winsup/w32api/lib/../include
-I../../../../../cygwin/winsup/w32api/lib/../../include
-I../../../../../cygwin/winsup/w32api/lib/../../../newlib/libc/include
-I../../../../../cygwin/winsup/w32api/lib/../../../newlib/libc/sys/cygwin
-o scrnsave.o ../../../../../cygwin/winsup/w32api/lib/scrnsave.c
In file included from
/home/ford/downloads/cygwin/winsup/w32api/include/windows.h:52,
                 from
../../../../../cygwin/winsup/w32api/lib/scrnsave.c:10:
/home/ford/downloads/cygwin/winsup/w32api/include/wingdi.h:2953: error:
syntax error before "ENUMLOGFONTEXDV"
/home/ford/downloads/cygwin/winsup/w32api/include/wingdi.h:2954: error:
syntax error before "PENUMLOGFONTEXDV"
/home/ford/downloads/cygwin/winsup/w32api/include/wingdi.h:2955: error:
syntax error before "LPENUMLOGFONTEXDV"

-- 
Brian Ford
Senior Realtime Software Engineer
VITAL - Visual Simulation Systems
FlightSafety International
Phone: 314-551-8460
Fax:   314-551-8444
-------------- next part --------------
Index: wingdi.h
===================================================================
RCS file: /cvs/src/src/winsup/w32api/include/wingdi.h,v
retrieving revision 1.33
diff -u -p -r1.33 wingdi.h
--- wingdi.h	18 Apr 2004 07:07:56 -0000	1.33
+++ wingdi.h	19 Apr 2004 22:29:52 -0000
@@ -2878,9 +2878,11 @@ typedef TEXTMETRICW TEXTMETRIC,*PTEXTMET
 #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;
@@ -2950,9 +2952,11 @@ typedef TEXTMETRICA TEXTMETRIC,*PTEXTMET
 #define ICMENUMPROC ICMENUMPROCA
 #define FONTENUMPROC FONTENUMPROCA
 typedef DEVMODEA DEVMODE,*PDEVMODE,*LPDEVMODE;
+#if _WIN32_WINNT >= 0x0500
 typedef ENUMLOGFONTEXDVA ENUMLOGFONTEXDV;
 typedef PENUMLOGFONTEXDVA PENUMLOGFONTEXDV;
 typedef LPENUMLOGFONTEXDVA LPENUMLOGFONTEXDV;
+#endif
 typedef EXTLOGFONTA EXTLOGFONT,*PEXTLOGFONT,*LPEXTLOGFONT;
 typedef GCP_RESULTSA GCP_RESULTS,*LPGCP_RESULTS;
 typedef OUTLINETEXTMETRICA OUTLINETEXTMETRIC,*POUTLINETEXTMETRIC,*LPOUTLINETEXTMETRIC;