From eeb206c615cd580a1773640f29c7143b21636e1e Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Wed, 4 Oct 2006 11:19:38 +0200 Subject: [PATCH] mscms: Restore the preprocessor hack. --- dlls/mscms/mscms_priv.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index 201b4978b88..74ceb9588f1 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -52,6 +52,18 @@ #include #endif +/* Funny thing is lcms.h defines DWORD as an 'unsigned long' whereas Wine + * defines it as an 'unsigned int'. To avoid compiler warnings we use a + * preprocessor define for DWORD and LPDWORD to get back Wine's orginal + * (typedef) definitions. + */ + +#undef DWORD +#undef LPDWORD + +#define DWORD DWORD +#define LPDWORD LPDWORD + extern DWORD MSCMS_hprofile2access( HPROFILE ); extern HPROFILE MSCMS_handle2hprofile( HANDLE file ); extern HPROFILE MSCMS_cmsprofile2hprofile( cmsHPROFILE cmsprofile ); -- 2.11.4.GIT