Use TQThread in krfb where threads interact with TQt3 instead of direct pthread access

This resolves Bug 1403

1 files changed, 7 insertions, 7 deletions

diff --git a/krfb/libvncserver/rfb.h b/krfb/libvncserver/rfb.h
index e8dbfb65..55736af8 100644
--- a/krfb/libvncserver/rfb.h
+++ b/krfb/libvncserver/rfb.h
@@ -154,7 +154,7 @@ typedef unsigned long KeySym;
 #define TIMEDWAIT(cond,mutex,t) {struct timeval tv;\
   tv.tv_sec = (t) / 1000;\
   tv.tv_usec = ((t) % 1000) * 1000;\
-  pthread_cond_timedwait(&(cond),&(mutex),&tv);}
+  pthread_cond_timedwait(&(cond),&(mutex),(const timespec*)(&tv));}
 #define COND(cond) pthread_cond_t (cond)
 #define INIT_COND(cond) pthread_cond_init(&(cond),NULL)
 #define TINI_COND(cond) pthread_cond_destroy(&(cond))
@@ -725,12 +725,12 @@ extern Bool rfbSendRectEncodingTight(rfbClientPtr cl, int x,int y,int w,int h);
 /* cursor.c */
 
 typedef struct rfbCursor {
-    unsigned char *source;			/* points to bits */
-    unsigned char *mask;			/* points to bits */
-    unsigned short width, height, xhot, yhot;	/* metrics */
-    unsigned short foreRed, foreGreen, foreBlue; /* device-independent colour */
-    unsigned short backRed, backGreen, backBlue; /* device-independent colour */
-    unsigned char *richSource; /* source bytes for a rich cursor */
+    const char *source;					/* points to bits */
+    const char *mask;					/* points to bits */
+    unsigned short width, height, xhot, yhot;		/* metrics */
+    unsigned short foreRed, foreGreen, foreBlue;	/* device-independent colour */
+    unsigned short backRed, backGreen, backBlue;	/* device-independent colour */
+    unsigned char *richSource;				/* source bytes for a rich cursor */
 } rfbCursor, *rfbCursorPtr;
 
 extern Bool rfbSendCursorShape(rfbClientPtr cl/*, rfbScreenInfoPtr pScreen*/);