| commit | d418682da7cdff05dcbdb81eaba8744648dab1e6 | [log] [tgz] |
|---|---|---|
| author | Ove Kaaven <ovek@arcticnet.no> | Sun Oct 14 16:07:23 2001 +0000 |
| committer | Alexandre Julliard <julliard@winehq.org> | Sun Oct 14 16:07:23 2001 +0000 |
| tree | a2e9a7a61e81946f468c6e3ade706bc04f5b04cf | |
| parent | 2905e0fb3699a2b7670c339c0881959e252bf5e8 [diff] |
Fix a UINT16 redefinition problem.
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index be7bb83..9bd4bd5 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c
@@ -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);