Added a NOGDI protection.

Replaced _MAX_PATH with MAX_PATH.
#undef can be used directly on TRANSPARENT.
This commit is contained in:
Francois Gouget 2000-10-13 23:12:19 +00:00 committed by Alexandre Julliard
parent ff04b4ee21
commit 6371e83259

View file

@ -1,11 +1,11 @@
#ifndef __WINE_WINGDI_H #ifndef _WINGDI_
#define __WINE_WINGDI_H #define _WINGDI_
#ifndef NOGDI
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define _WINGDI_
#include "pshpack1.h" #include "pshpack1.h"
@ -165,7 +165,7 @@ typedef struct tagLOGCOLORSPACEA
DWORD lcsGammaRed; DWORD lcsGammaRed;
DWORD lcsGammaGreen; DWORD lcsGammaGreen;
DWORD lcsGammaBlue; DWORD lcsGammaBlue;
CHAR lcsFilename[_MAX_PATH]; CHAR lcsFilename[MAX_PATH];
} LOGCOLORSPACEA, *LPLOGCOLORSPACEA; } LOGCOLORSPACEA, *LPLOGCOLORSPACEA;
typedef struct tagLOGCOLORSPACEW typedef struct tagLOGCOLORSPACEW
@ -179,7 +179,7 @@ typedef struct tagLOGCOLORSPACEA
DWORD lcsGammaRed; DWORD lcsGammaRed;
DWORD lcsGammaGreen; DWORD lcsGammaGreen;
DWORD lcsGammaBlue; DWORD lcsGammaBlue;
WCHAR lcsFilename[_MAX_PATH]; WCHAR lcsFilename[MAX_PATH];
} LOGCOLORSPACEW, *LPLOGCOLORSPACEW; } LOGCOLORSPACEW, *LPLOGCOLORSPACEW;
DECL_WINELIB_TYPE_AW(LPLOGCOLORSPACE) DECL_WINELIB_TYPE_AW(LPLOGCOLORSPACE)
@ -1437,10 +1437,9 @@ typedef struct tagEXTLOGPEN
#define WINDING 2 #define WINDING 2
#define POLYFILL_LAST 2 #define POLYFILL_LAST 2
/* Background modes */ /* Background modes */
#ifdef TRANSPARENT /*Apparently some broken svr4 includes define TRANSPARENT*/ /* Apparently some broken svr4 includes define TRANSPARENT */
#undef TRANSPARENT #undef TRANSPARENT
#endif
#define TRANSPARENT 1 #define TRANSPARENT 1
#define OPAQUE 2 #define OPAQUE 2
#define BKMODE_LAST 2 #define BKMODE_LAST 2
@ -3354,4 +3353,5 @@ BOOL WINAPI PolyTextOutW(HDC,PPOLYTEXTW,INT);
} }
#endif #endif
#endif /* __WINE_WINGDI_H */ #endif /* !NOGDI */
#endif /* _WINGDI_ */