Fix a UINT16 redefinition problem.
This commit is contained in:
parent
2905e0fb36
commit
d418682da7
|
@ -45,9 +45,11 @@
|
||||||
#ifdef HAVE_LIBJPEG
|
#ifdef HAVE_LIBJPEG
|
||||||
/* This is a hack, so jpeglib.h does not redefine INT32 and the like*/
|
/* This is a hack, so jpeglib.h does not redefine INT32 and the like*/
|
||||||
#define XMD_H
|
#define XMD_H
|
||||||
|
#define UINT16 JPEG_UINT16
|
||||||
#ifdef HAVE_JPEGLIB_H
|
#ifdef HAVE_JPEGLIB_H
|
||||||
# include <jpeglib.h>
|
# include <jpeglib.h>
|
||||||
#endif
|
#endif
|
||||||
|
#undef UINT16
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DEFAULT_DEBUG_CHANNEL(ole);
|
DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
Loading…
Reference in New Issue