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 ++++
 libvncclient/tight.c     | 3 +++
 libvncclient/vncviewer.c | 2 ++
 3 files changed, 9 insertions(+)

(limited to 'libvncclient')

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);
@@ -481,6 +482,7 @@ SetFormatAndEncodings(rfbClient* client)
 	  requestCompressLevel = TRUE;
 	if (client->appData.enableJPEG)
 	  requestQualityLevel = TRUE;
+#endif
 #endif
       } else if (strncasecmp(encStr,"hextile",encStrLen) == 0) {
 	encs[se->nEncodings++] = rfbClientSwap32IfLE(rfbEncodingHextile);
@@ -547,8 +549,10 @@ 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
diff --git a/libvncclient/tight.c b/libvncclient/tight.c
index 48a27e9..f9cc946 100644
--- a/libvncclient/tight.c
+++ b/libvncclient/tight.c
@@ -17,6 +17,7 @@
  *  USA.
  */
 
+#ifdef LIBVNCSERVER_HAVE_LIBZ
 #ifdef LIBVNCSERVER_HAVE_LIBJPEG
 
 /*
@@ -681,5 +682,7 @@ JpegSetSrcManager(j_decompress_ptr cinfo,
 
 #undef CARDBPP
 
+/* LIBVNCSERVER_HAVE_LIBZ and LIBVNCSERVER_HAVE_LIBJPEG */
+#endif
 #endif
 
diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c
index 607a2bb..31b4d3d 100644
--- a/libvncclient/vncviewer.c
+++ b/libvncclient/vncviewer.c
@@ -159,9 +159,11 @@ rfbClient* rfbGetClient(int bitsPerSample,int samplesPerPixel,
   client->decompStreamInited = FALSE;
 #endif
 
+#ifdef LIBVNCSERVER_HAVE_LIBZ
 #ifdef LIBVNCSERVER_HAVE_LIBJPEG
   memset(client->zlibStreamActive,0,sizeof(rfbBool)*4);
   client->jpegSrcManager = NULL;
+#endif
 #endif
 
   client->HandleCursorPos = DummyPoint;
-- 
cgit v1.2.3