Protect PALETTEENTRY and LOGPALETTE with #ifndefs.

This commit is contained in:
Ove Kaaven 2002-12-02 18:58:46 +00:00 committed by Alexandre Julliard
parent 742142521a
commit 0e32a2bf85

View File

@ -1388,22 +1388,28 @@ typedef struct
#define SYSPAL_STATIC 1 #define SYSPAL_STATIC 1
#define SYSPAL_NOSTATIC 2 #define SYSPAL_NOSTATIC 2
#ifndef _PALETTEENTRY_DEFINED
#define _PALETTEENTRY_DEFINED
typedef struct tagPALETTEENTRY typedef struct tagPALETTEENTRY
{ {
BYTE peRed, peGreen, peBlue, peFlags; BYTE peRed, peGreen, peBlue, peFlags;
} PALETTEENTRY, *PPALETTEENTRY, *LPPALETTEENTRY; } PALETTEENTRY, *PPALETTEENTRY, *LPPALETTEENTRY;
#endif
/* Logical palette entry flags */ /* Logical palette entry flags */
#define PC_RESERVED 0x01 #define PC_RESERVED 0x01
#define PC_EXPLICIT 0x02 #define PC_EXPLICIT 0x02
#define PC_NOCOLLAPSE 0x04 #define PC_NOCOLLAPSE 0x04
#ifndef _LOGPALETTE_DEFINED
#define _LOGPALETTE_DEFINED
typedef struct tagLOGPALETTE typedef struct tagLOGPALETTE
{ {
WORD palVersion; WORD palVersion;
WORD palNumEntries; WORD palNumEntries;
PALETTEENTRY palPalEntry[1]; PALETTEENTRY palPalEntry[1];
} LOGPALETTE, *PLOGPALETTE, *LPLOGPALETTE, *NPLOGPALETTE; } LOGPALETTE, *PLOGPALETTE, *LPLOGPALETTE, *NPLOGPALETTE;
#endif
/* Pens */ /* Pens */