Hans Leidekker : mscms: Restore the preprocessor hack.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: eeb206c615cd580a1773640f29c7143b21636e1e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eeb206c615cd580a1773640f29...

Author: Hans Leidekker 
Date:   Wed Oct  4 11:19:38 2006 +0200

mscms: Restore the preprocessor hack.

---

dlls/mscms/mscms_priv.h |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h
index 201b497..74ceb95 100644
--- a/dlls/mscms/mscms_priv.h
+++ b/dlls/mscms/mscms_priv.h
@@ -52,6 +52,18 @@ #else
 #include <lcms.h>
 #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 );