Attachment #393670 for bug #526470

Lines 682-684 Link Here

(-)tigervnc-1.3.1/unix/xserver/hw/xwayland/xwayland.c~ (+5 lines)
682	FatalError("Couldn't add screen\n");	682	FatalError("Couldn't add screen\n");
683	}	683	}
684	}	684	}
		685
		686	// never called with Xwayland, satisfy 'os' linked
		687	// lib externs used only with Xvnc binary
		688	void vncWriteBlockHandler(fd_set *fds) { }
		689	void vncWriteWakeupHandler(int nfds, fd_set *fds) { }

Lines 37-43 Link Here

(-)tigervnc-1.3.1/unix/xserver/hw/vnc/Makefile.am~ (-1 / +1 lines)
37	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \	37	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \
38	-I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir)	38	-I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir)
39		39
40	Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \	40	Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) $(OS_LIB) \
41	$(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11	41	$(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11
42		42
43	Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)	43	Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)

Return to bug 526470