diff options
author | Tim Waugh <twaugh@redhat.com> | 2015-02-24 16:20:41 +0000 |
---|---|---|
committer | Tim Waugh <twaugh@redhat.com> | 2015-02-25 12:15:31 +0000 |
commit | 242fdf0c5a5483910537419a4833c3f725889095 (patch) | |
tree | 3f8312461c6d20caee873e6339f7285d61866938 /unix/xserver | |
parent | 52a18150a7a8f2802000136c35005bc83b5b0855 (diff) | |
download | tigervnc-242fdf0c5a5483910537419a4833c3f725889095.tar.gz tigervnc-242fdf0c5a5483910537419a4833c3f725889095.zip |
Updated to build against xorg-x11-server 1.17.x.
Diffstat (limited to 'unix/xserver')
-rw-r--r-- | unix/xserver/hw/vnc/xorg-version.h | 4 | ||||
-rw-r--r-- | unix/xserver/hw/vnc/xvnc.c | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h index 057c31e7..083c1b1e 100644 --- a/unix/xserver/hw/vnc/xorg-version.h +++ b/unix/xserver/hw/vnc/xorg-version.h @@ -48,8 +48,10 @@ #define XORG 115 #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (16 * 100000) + (99 * 1000)) #define XORG 116 +#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000)) +#define XORG 117 #else -#error "X.Org newer than 1.16 is not supported" +#error "X.Org newer than 1.17 is not supported" #endif #endif diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c index 04dd0b90..042c0a49 100644 --- a/unix/xserver/hw/vnc/xvnc.c +++ b/unix/xserver/hw/vnc/xvnc.c @@ -679,9 +679,9 @@ vfbInstallColormap(ColormapPtr pmap) entries = pmap->pVisual->ColormapEntries; pVisual = pmap->pVisual; - ppix = (Pixel *)xalloc(entries * sizeof(Pixel)); - prgb = (xrgb *)xalloc(entries * sizeof(xrgb)); - defs = (xColorItem *)xalloc(entries * sizeof(xColorItem)); + ppix = (Pixel *)calloc(entries, sizeof(Pixel)); + prgb = (xrgb *)calloc(entries, sizeof(xrgb)); + defs = (xColorItem *)calloc(entries, sizeof(xColorItem)); for (i = 0; i < entries; i++) ppix[i] = i; /* XXX truecolor */ @@ -700,9 +700,9 @@ vfbInstallColormap(ColormapPtr pmap) } (*pmap->pScreen->StoreColors)(pmap, entries, defs); - xfree(ppix); - xfree(prgb); - xfree(defs); + free(ppix); + free(prgb); + free(defs); } } |