From 8eb18f6cd8793ea55f04d3c736885b04c41aba4f Mon Sep 17 00:00:00 2001 From: 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. --- rfb/rfbclient.h | 2 ++ rfb/rfbproto.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'rfb') diff --git a/rfb/rfbclient.h b/rfb/rfbclient.h index c99f4f9..8759b0e 100644 --- a/rfb/rfbclient.h +++ b/rfb/rfbclient.h @@ -157,6 +157,7 @@ typedef struct _rfbClient { #endif +#ifdef LIBVNCSERVER_HAVE_LIBZ #ifdef LIBVNCSERVER_HAVE_LIBJPEG /* * Variables for the ``tight'' encoding implementation. @@ -183,6 +184,7 @@ typedef struct _rfbClient { void* jpegBufferPtr; size_t jpegBufferLen; +#endif #endif diff --git a/rfb/rfbproto.h b/rfb/rfbproto.h index 60ba763..cadbce4 100644 --- a/rfb/rfbproto.h +++ b/rfb/rfbproto.h @@ -905,7 +905,7 @@ typedef struct _rfbFileTransferMsg { uint8_t contentType; /* See defines below */ uint16_t contentParam;/* Other possible content classification (Dir or File name, etc..) */ uint32_t size; /* FileSize or packet index or error or other */ - /* uint32_t sizeH; // Additional 32Bits params to handle big values. Only for V2 (we want backward compatibility between all V1 versions) */ + /* uint32_t sizeH; Additional 32Bits params to handle big values. Only for V2 (we want backward compatibility between all V1 versions) */ uint32_t length; /* followed by data char text[length] */ } rfbFileTransferMsg; -- cgit v1.2.3