summaryrefslogtreecommitdiffstats
path: root/x11vnc/misc
diff options
context:
space:
mode:
authorrunge <[email protected]>2009-05-21 10:57:03 -0400
committerrunge <[email protected]>2009-05-21 10:57:03 -0400
commit94d058b35f075cec2d6e8b6e37ee1a94086ea3f8 (patch)
tree6cec0620ab70b5db6b33645dbcac1071f3c7a556 /x11vnc/misc
parent804335f9d296440bb708ca844f5d89b58b50b0c6 (diff)
downloadlibtdevnc-94d058b35f075cec2d6e8b6e37ee1a94086ea3f8.tar.gz
libtdevnc-94d058b35f075cec2d6e8b6e37ee1a94086ea3f8.zip
Thread safety. Fix -clip -in -rawfb. Try to avoid Xorg stuck
key bug.
Diffstat (limited to 'x11vnc/misc')
-rwxr-xr-xx11vnc/misc/turbovnc/convert11
1 files changed, 11 insertions, 0 deletions
diff --git a/x11vnc/misc/turbovnc/convert b/x11vnc/misc/turbovnc/convert
index c0495a2..f218f84 100755
--- a/x11vnc/misc/turbovnc/convert
+++ b/x11vnc/misc/turbovnc/convert
@@ -19,6 +19,13 @@ while (<>) {
#define xrealloc realloc
#define rfbTightNoZlib 0x0A
#define tightSubsampLevel correMaxWidth
+
+#if LIBVNCSERVER_HAVE_LIBPTHREAD && LIBVNCSERVER_HAVE_TLS
+#define TLS __thread
+#else
+#define TLS
+#endif
+
END
next;
}
@@ -38,6 +45,10 @@ END
# $_ =~ s/cl->tightQualityLevel;/cl->tightQualityLevel * 10;/;
+ if (/^static\s+(Bool|int|CARD32|PALETTE|char|unsigned|tjhandle)\s+[^()]*;\s*$/) {
+ $_ =~ s/^static/static TLS /;
+ }
+
$_ =~ s/rfbScreen.pfbMemory/cl->scaledScreen->frameBuffer/g;
$_ =~ s/rfbScreen.paddedWidthInBytes/cl->scaledScreen->paddedWidthInBytes/g;
$_ =~ s/rfbScreen.bitsPerPixel/cl->scaledScreen->bitsPerPixel/g;