summaryrefslogtreecommitdiffstats
path: root/x11vnc/screen.c
diff options
context:
space:
mode:
authorrunge <runge>2008-11-05 01:18:29 +0000
committerrunge <runge>2008-11-05 01:18:29 +0000
commit63b98dba790fa9835e970b8502d93258862a9373 (patch)
tree52b5ba99d6f9fe4b8a818eee16955e5e4e5b50de /x11vnc/screen.c
parentcb67ada73b007d5f237a281576f753ec6c15844b (diff)
downloadlibtdevnc-63b98dba790fa9835e970b8502d93258862a9373.tar.gz
libtdevnc-63b98dba790fa9835e970b8502d93258862a9373.zip
x11vnc: add zeroconf external helpers (avahi-publish and
dns-sd). Alias -zeroconf. Close pipeinput_fh on exit. Kludge to make -solid work on MacOSX console. Attempt at cpp macros to disable newer libvncserver interfaces.
Diffstat (limited to 'x11vnc/screen.c')
-rw-r--r--x11vnc/screen.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/x11vnc/screen.c b/x11vnc/screen.c
index a4f119f..6b17301 100644
--- a/x11vnc/screen.c
+++ b/x11vnc/screen.c
@@ -1557,7 +1557,7 @@ if (db) fprintf(stderr, "initialize_raw_fb reset\n");
if (sscanf(str, "shm:%d", &shmid) == 1) {
/* shm:N */
-#if LIBVNCSERVER_HAVE_XSHM
+#if LIBVNCSERVER_HAVE_XSHM || LIBVNCSERVER_HAVE_SHMAT
raw_fb_addr = (char *) shmat(shmid, 0, SHM_RDONLY);
if (! raw_fb_addr) {
rfbLogEnable(1);
@@ -3402,8 +3402,10 @@ static void record_last_fb_update(void) {
#if 0
rbs += cl->rawBytesEquivalent;
#else
+#if LIBVNCSERVER_HAS_STATS
rbs += rfbStatGetSentBytesIfRaw(cl);
#endif
+#endif
}
rfbReleaseClientIterator(iter);