summaryrefslogtreecommitdiffstats
path: root/xorg/server/module/rdpRandR.c
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2014-01-28 14:12:20 -0800
committerJay Sorg <jay.sorg@gmail.com>2014-01-28 14:12:20 -0800
commit97070b6fd90bcf48da805c42f8e0103831c5752a (patch)
tree3e073b08a0b13e4097ad8ccb03454a138cb64de4 /xorg/server/module/rdpRandR.c
parent6beb2364f38f5e53b0acb744ffc8225c9c13e492 (diff)
downloadxrdp-proprietary-97070b6fd90bcf48da805c42f8e0103831c5752a.tar.gz
xrdp-proprietary-97070b6fd90bcf48da805c42f8e0103831c5752a.zip
xorg: fixes for building with xserver v1.13+
Diffstat (limited to 'xorg/server/module/rdpRandR.c')
-rw-r--r--xorg/server/module/rdpRandR.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/xorg/server/module/rdpRandR.c b/xorg/server/module/rdpRandR.c
index c90c0303..37577645 100644
--- a/xorg/server/module/rdpRandR.c
+++ b/xorg/server/module/rdpRandR.c
@@ -27,6 +27,7 @@ RandR draw calls
/* this should be before all X11 .h files */
#include <xorg-server.h>
+#include <xorgVersion.h>
/* all driver need this */
#include <xf86.h>
@@ -141,8 +142,13 @@ rdpRRScreenSetSize(ScreenPtr pScreen, CARD16 width, CARD16 height,
RRGetInfo(pScreen, 1);
LLOGLN(0, (" screen resized to %dx%d", pScreen->width, pScreen->height));
RRScreenSizeNotify(pScreen);
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 13, 0, 0, 0)
xf86EnableDisableFBAccess(pScreen->myNum, FALSE);
xf86EnableDisableFBAccess(pScreen->myNum, TRUE);
+#else
+ xf86EnableDisableFBAccess(xf86Screens[pScreen->myNum], FALSE);
+ xf86EnableDisableFBAccess(xf86Screens[pScreen->myNum], TRUE);
+#endif
return TRUE;
}