1 diff -up tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h.xserver117 tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h
2 --- tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h.xserver117 2015-01-23 23:37:23.000000000 +0000
3 +++ tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h 2015-02-13 17:35:29.847294663 +0000
6 #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (16 * 100000) + (99 * 1000))
8 +#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000))
11 -#error "X.Org newer than 1.16 is not supported"
12 +#error "X.Org newer than 1.17 is not supported"
16 diff -up tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc.xserver117 tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc
17 --- tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc.xserver117 2015-01-23 23:37:23.000000000 +0000
18 +++ tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc 2015-02-13 17:35:27.963265774 +0000
19 @@ -717,9 +717,9 @@ vfbInstallColormap(ColormapPtr pmap)
20 entries = pmap->pVisual->ColormapEntries;
21 pVisual = pmap->pVisual;
23 - ppix = (Pixel *)xalloc(entries * sizeof(Pixel));
24 - prgb = (xrgb *)xalloc(entries * sizeof(xrgb));
25 - defs = (xColorItem *)xalloc(entries * sizeof(xColorItem));
26 + ppix = (Pixel *)malloc(entries * sizeof(Pixel));
27 + prgb = (xrgb *)malloc(entries * sizeof(xrgb));
28 + defs = (xColorItem *)malloc(entries * sizeof(xColorItem));
30 for (i = 0; i < entries; i++) ppix[i] = i;
32 @@ -738,9 +738,9 @@ vfbInstallColormap(ColormapPtr pmap)
34 (*pmap->pScreen->StoreColors)(pmap, entries, defs);