summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPriit Laes <plaes@plaes.org>2010-12-15 03:54:13 +0200
committerMartin-Éric Racine <martin-eric.racine@iki.fi>2010-12-15 17:30:14 +0200
commitb9a5a86a402832fe699e43b3030932b50ae821a0 (patch)
tree7e928c4136bf0b8d5db1312e2ecb68a1ca253e17
parentbae443bb46c81702a57d4914b7e56f17e5aa1f3a (diff)
Restoring compatibility down to X server 1.4
Signed-off-by: Priit Laes <plaes@plaes.org>
-rw-r--r--src/lx_display.c6
-rw-r--r--src/lx_output.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/src/lx_display.c b/src/lx_display.c
index d34a25f..ca6fed1 100644
--- a/src/lx_display.c
+++ b/src/lx_display.c
@@ -389,7 +389,13 @@ lx_create_bo_pixmap(ScreenPtr pScreen,
{
PixmapPtr pixmap;
+
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,5,0,0,0)
pixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth, 0);
+#else
+ pixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, depth);
+#endif
+
if (!pixmap)
return NULL;
if (!(*pScreen->ModifyPixmapHeader)(pixmap, width, height,
diff --git a/src/lx_output.c b/src/lx_output.c
index cd1809b..6e36426 100644
--- a/src/lx_output.c
+++ b/src/lx_output.c
@@ -247,10 +247,12 @@ lx_output_destroy(xf86OutputPtr output)
output->driver_private = NULL;
}
+#ifdef RANDR_GET_CRTC_INTERFACE
static xf86CrtcPtr lx_output_get_crtc(xf86OutputPtr output)
{
return output->crtc;
}
+#endif
static const xf86OutputFuncsRec lx_output_funcs = {
@@ -265,7 +267,9 @@ static const xf86OutputFuncsRec lx_output_funcs = {
.commit = lx_output_commit,
.detect = lx_output_detect,
.get_modes = lx_output_get_modes,
+#ifdef RANDR_GET_CRTC_INTERFACE
.get_crtc = lx_output_get_crtc,
+#endif
.set_property = lx_output_set_property,
.destroy = lx_output_destroy,
};