From 4d87189420b6225da7f38aa71aee840d816bd570 Mon Sep 17 00:00:00 2001
From: dscho <dscho>
Date: Fri, 6 Dec 2002 16:03:50 +0000
Subject: compiler warnings, contrib directory, new x11vnc from Karl Runge

---
 rfb.h | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'rfb.h')

diff --git a/rfb.h b/rfb.h
index 856dd9b..37aac35 100644
--- a/rfb.h
+++ b/rfb.h
@@ -164,9 +164,17 @@ typedef int socklen_t;
    the library and your application (at least the parts including rfb.h)
    with the same support for pthreads. */
 #ifdef HAVE_PTHREADS
-#define rfbInitServer rfbInitServerWithPthreads
+#ifdef HAVE_ZRLE
+#define rfbInitServer rfbInitServerWithPthreadsAndZRLE
+#else
+#define rfbInitServer rfbInitServerWithPthreadsButWithoutZRLE
+#endif
+#else
+#ifdef HAVE_ZRLE
+#define rfbInitServer rfbInitServerWithoutPthreadsButWithZRLE
 #else
-#define rfbInitServer rfbInitServerWithoutPthreads
+#define rfbInitServer rfbInitServerWithoutPthreadsAndZRLE
+#endif
 #endif
 
 #define MAX_ENCODINGS 10
@@ -409,9 +417,6 @@ typedef struct _rfbClientRec {
     Bool useCopyRect;
     int preferredEncoding;
     int correMaxWidth, correMaxHeight;
-#ifdef HAVE_ZRLE
-    void* zrleData;
-#endif
 
     /* The following member is only used during VNC authentication */
     CARD8 authChallenge[CHALLENGESIZE];
@@ -538,6 +543,10 @@ typedef struct _rfbClientRec {
     COND(updateCond);
 #endif
 
+#ifdef HAVE_ZRLE
+    void* zrleData;
+#endif
+
 } rfbClientRec, *rfbClientPtr;
 
 /*
@@ -725,9 +734,10 @@ extern void rfbSetCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr c,Bool freeOld)
 extern void defaultPtrAddEvent(int buttonMask,int x,int y,rfbClientPtr cl);
 
 /* zrle.c */
-
+#ifdef HAVE_ZRLE
 extern Bool rfbSendRectEncodingZRLE(rfbClientPtr cl, int x, int y, int w,int h);
 extern void FreeZrleData(rfbClientPtr cl);
+#endif
 
 /* stats.c */
 
-- 
cgit v1.2.1