diff options
| author | runge <runge> | 2005-11-25 07:22:43 +0000 |
|---|---|---|
| committer | runge <runge> | 2005-11-25 07:22:43 +0000 |
| commit | 8eb18f6cd8793ea55f04d3c736885b04c41aba4f (patch) | |
| tree | d447343f6495e703690217928e2783dc1636df26 /libvncclient | |
| parent | de99644d2fa630828fd6e92ed206dd63da1fdfa9 (diff) | |
| download | libvncserver-8eb18f6cd8793ea55f04d3c736885b04c41aba4f.zip libvncserver-8eb18f6cd8793ea55f04d3c736885b04c41aba4f.tar.gz | |
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.
Diffstat (limited to 'libvncclient')
| -rw-r--r-- | libvncclient/rfbproto.c | 4 | ||||
| -rw-r--r-- | libvncclient/tight.c | 3 | ||||
| -rw-r--r-- | libvncclient/vncviewer.c | 2 |
3 files changed, 9 insertions, 0 deletions
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); 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,10 +159,12 @@ 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; client->SoftCursorLockArea = DummyRect; |
