Commit ad254469 authored by Christian Beier's avatar Christian Beier

Fix MinGW32 compilation with libjpeg.

MinGW32 (or more exactly, a rpcndr.h file included by
winsock2.h) typedefs a 'boolean' type that jmorecfg.h
included by jpeglib.h also tries to typedef.
So, tell the jpeg headers.

Closes: 3007302
parent 79f0f137
...@@ -47,6 +47,9 @@ ...@@ -47,6 +47,9 @@
#endif #endif
#endif #endif
#ifdef LIBVNCSERVER_HAVE_LIBJPEG #ifdef LIBVNCSERVER_HAVE_LIBJPEG
#ifdef _RPCNDR_H /* This Windows header typedefs 'boolean', jpeglib has to know */
#define HAVE_BOOLEAN
#endif
#include <jpeglib.h> #include <jpeglib.h>
#endif #endif
#include <stdarg.h> #include <stdarg.h>
......
...@@ -34,6 +34,9 @@ ...@@ -34,6 +34,9 @@
#define NEEDFAR_POINTERS #define NEEDFAR_POINTERS
#endif #endif
#ifdef _RPCNDR_H /* This Windows header typedefs 'boolean', jpeglib has to know */
#define HAVE_BOOLEAN
#endif
#include <jpeglib.h> #include <jpeglib.h>
/* Note: The following constant should not be changed. */ /* Note: The following constant should not be changed. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment