Because a couple of wingdi types needs to be defined in wtypes.idl, and
wtypes.h should work both with and without including wingdi.h, we need to
protect these types a bit.
Log:
Ove Kaaven <ovek@transgaming.com>
Protect PALETTEENTRY and LOGPALETTE with #ifndefs.
Index: include/wingdi.h
===================================================================
RCS file: /home/wine/wine/include/wingdi.h,v
retrieving revision 1.82
diff -u -r1.82 wingdi.h
--- include/wingdi.h 21 Nov 2002 03:56:29 -0000 1.82
+++ include/wingdi.h 2 Dec 2002 07:10:08 -0000
@@ -1388,22 +1388,28 @@
#define SYSPAL_STATIC 1
#define SYSPAL_NOSTATIC 2
+#ifndef _PALETTEENTRY_DEFINED
+#define _PALETTEENTRY_DEFINED
typedef struct tagPALETTEENTRY
{
BYTE peRed, peGreen, peBlue, peFlags;
} PALETTEENTRY, *PPALETTEENTRY, *LPPALETTEENTRY;
+#endif
/* Logical palette entry flags */
#define PC_RESERVED 0x01
#define PC_EXPLICIT 0x02
#define PC_NOCOLLAPSE 0x04
+#ifndef _LOGPALETTE_DEFINED
+#define _LOGPALETTE_DEFINED
typedef struct tagLOGPALETTE
{
WORD palVersion;
WORD palNumEntries;
PALETTEENTRY palPalEntry[1];
} LOGPALETTE, *PLOGPALETTE, *LPLOGPALETTE, *NPLOGPALETTE;
+#endif
/* Pens */
