olepicture.c patch
Ove Kaaven
ovek at arcticnet.no
Sat Oct 13 12:11:49 CDT 2001
jpeglib.h redefines UINT16, which is also defined in windef16.h. Both are
included into olepicture.c. gcc 2.95 treats this redefinition as a warning
and lets the compile proceed, but gcc 2.7.2 treats this as an error, so
the compilation will fail on e.g. Debian Potato. I added this hack to get
around that...
Log:
Fix a UINT16 redefinition problem.
Index: dlls/oleaut32/olepicture.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/olepicture.c,v
retrieving revision 1.11
diff -u -r1.11 olepicture.c
--- dlls/oleaut32/olepicture.c 2001/08/21 17:03:10 1.11
+++ dlls/oleaut32/olepicture.c 2001/10/13 15:46:02
@@ -45,9 +45,11 @@
#ifdef HAVE_LIBJPEG
/* This is a hack, so jpeglib.h does not redefine INT32 and the like*/
#define XMD_H
+#define UINT16 JPEG_UINT16
#ifdef HAVE_JPEGLIB_H
# include <jpeglib.h>
#endif
+#undef UINT16
#endif
DEFAULT_DEBUG_CHANNEL(ole);
More information about the wine-patches
mailing list