From fe1d7d5341ccfa2e31bb4d18ac418fe84ce482cd Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Tue, 20 Jul 2010 09:33:46 +0000 Subject: [PATCH] [Development] Pass "serverClient" to QueryColors when compiling against X.Org 1.9.X. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4091 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- unix/xserver/hw/vnc/xvnc.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc index a6f27b34..15235e10 100644 --- a/unix/xserver/hw/vnc/xvnc.cc +++ b/unix/xserver/hw/vnc/xvnc.cc @@ -630,7 +630,11 @@ vfbInstallColormap(ColormapPtr pmap) for (i = 0; i < entries; i++) ppix[i] = i; /* XXX truecolor */ +#if XORG < 19 QueryColors(pmap, entries, ppix, prgb); +#else + QueryColors(pmap, entries, ppix, prgb, serverClient); +#endif for (i = 0; i < entries; i++) { /* convert xrgbs to xColorItems */ defs[i].pixel = ppix[i] & 0xff; /* change pixel to index */ -- 2.39.5