diff options
author | Christian Beier <dontmind@freeshell.org> | 2010-09-06 15:52:48 +0200 |
---|---|---|
committer | Christian Beier <dontmind@freeshell.org> | 2010-09-06 15:52:48 +0200 |
commit | ad254469783b4720db64d8ebeeb12aeb0533e542 (patch) | |
tree | 28e55489813e99a8109c25f2c592956d2f6cce72 | |
parent | 79f0f1374cabb3d252e9eda0d13fc21857991b2e (diff) | |
download | libvncserver-ad254469783b4720db64d8ebeeb12aeb0533e542.zip libvncserver-ad254469783b4720db64d8ebeeb12aeb0533e542.tar.gz |
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
-rw-r--r-- | libvncclient/rfbproto.c | 3 | ||||
-rw-r--r-- | libvncserver/tight.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c index 83ba3a5..df8eb2f 100644 --- a/libvncclient/rfbproto.c +++ b/libvncclient/rfbproto.c @@ -47,6 +47,9 @@ #endif #endif #ifdef LIBVNCSERVER_HAVE_LIBJPEG +#ifdef _RPCNDR_H /* This Windows header typedefs 'boolean', jpeglib has to know */ +#define HAVE_BOOLEAN +#endif #include <jpeglib.h> #endif #include <stdarg.h> diff --git a/libvncserver/tight.c b/libvncserver/tight.c index 54eb921..bb033c3 100644 --- a/libvncserver/tight.c +++ b/libvncserver/tight.c @@ -34,6 +34,9 @@ #define NEEDFAR_POINTERS #endif +#ifdef _RPCNDR_H /* This Windows header typedefs 'boolean', jpeglib has to know */ +#define HAVE_BOOLEAN +#endif #include <jpeglib.h> /* Note: The following constant should not be changed. */ |