From 8eb18f6cd8793ea55f04d3c736885b04c41aba4f Mon Sep 17 00:00:00 2001
From: runge <runge>
Date: Fri, 25 Nov 2005 07:22:43 +0000
Subject:  fix deadlock from rfbReleaseExtensionIterator(), fix no libz/libjpeg
 builds, disable tightvnc-filetransfer if no libpthread, add --without-pthread
 option, rm // comments, set NAME_MAX if not defined, x11vnc: throttle load if
 fb update requests not taking place.

---
 libvncclient/rfbproto.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libvncclient/rfbproto.c')

diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c
index 1a491a9..7f79c92 100644
--- a/libvncclient/rfbproto.c
+++ b/libvncclient/rfbproto.c
@@ -473,6 +473,7 @@ SetFormatAndEncodings(rfbClient* client)
 	encs[se->nEncodings++] = rfbClientSwap32IfLE(rfbEncodingRaw);
       } else if (strncasecmp(encStr,"copyrect",encStrLen) == 0) {
 	encs[se->nEncodings++] = rfbClientSwap32IfLE(rfbEncodingCopyRect);
+#ifdef LIBVNCSERVER_HAVE_LIBZ
 #ifdef LIBVNCSERVER_HAVE_LIBJPEG
       } else if (strncasecmp(encStr,"tight",encStrLen) == 0) {
 	encs[se->nEncodings++] = rfbClientSwap32IfLE(rfbEncodingTight);
@@ -482,6 +483,7 @@ SetFormatAndEncodings(rfbClient* client)
 	if (client->appData.enableJPEG)
 	  requestQualityLevel = TRUE;
 #endif
+#endif
       } else if (strncasecmp(encStr,"hextile",encStrLen) == 0) {
 	encs[se->nEncodings++] = rfbClientSwap32IfLE(rfbEncodingHextile);
 #ifdef LIBVNCSERVER_HAVE_LIBZ
@@ -547,9 +549,11 @@ SetFormatAndEncodings(rfbClient* client)
     }
 
     encs[se->nEncodings++] = rfbClientSwap32IfLE(rfbEncodingCopyRect);
+#ifdef LIBVNCSERVER_HAVE_LIBZ
 #ifdef LIBVNCSERVER_HAVE_LIBJPEG
     encs[se->nEncodings++] = rfbClientSwap32IfLE(rfbEncodingTight);
 #endif
+#endif
     encs[se->nEncodings++] = rfbClientSwap32IfLE(rfbEncodingHextile);
 #ifdef LIBVNCSERVER_HAVE_LIBZ
     encs[se->nEncodings++] = rfbClientSwap32IfLE(rfbEncodingZlib);
-- 
cgit v1.1