From 63b98dba790fa9835e970b8502d93258862a9373 Mon Sep 17 00:00:00 2001
From: runge <runge>
Date: Wed, 5 Nov 2008 01:18:29 +0000
Subject: 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.

---
 x11vnc/screen.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'x11vnc/screen.c')

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,7 +3402,9 @@ static void record_last_fb_update(void) {
 #if 0
 		rbs += cl->rawBytesEquivalent;
 #else
+#if LIBVNCSERVER_HAS_STATS
 		rbs += rfbStatGetSentBytesIfRaw(cl);
+#endif
 #endif
 	}
 	rfbReleaseClientIterator(iter);
-- 
cgit v1.2.1