xf86-video-intel: src/sna/sna_display.c src/uxa/intel_display.c

[Chris Wilson]

 src/sna/sna_display.c   |    2 +-
 src/uxa/intel_display.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 454367f5945dd17a7cfc566b1986654fc976cabe
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jun 2 09:25:01 2014 +0100

    Only enable the new Cursor API for the next pre-release of Xorg
    
    Make sure we can compile against the pre-release tarballs at the expense
    of an innocuous compile warning if compiled against xserver.git
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 62dce47..13dbf64 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4051,7 +4051,7 @@ sna_cursors_init(ScreenPtr screen, struct sna *sna)
 	cursor_info->UseHWCursorARGB = sna_use_hw_cursor;
 	cursor_info->LoadCursorARGB = sna_load_cursor_argb;
 #endif
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,2)
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,3)
 	cursor_info->LoadCursorImageCheck = sna_load_cursor_image2;
 #ifdef ARGB_CURSOR
 	cursor_info->LoadCursorARGBCheck = sna_load_cursor_argb2;
diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
index 4a41d4d..95ddcc8 100644
--- a/src/uxa/intel_display.c
+++ b/src/uxa/intel_display.c
@@ -678,7 +678,7 @@ static const xf86CrtcFuncsRec intel_crtc_funcs = {
 	.set_cursor_position = intel_crtc_set_cursor_position,
 	.show_cursor = intel_crtc_show_cursor,
 	.hide_cursor = intel_crtc_hide_cursor,
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,2)
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,3)
 	.load_cursor_argb_check = intel_crtc_load_cursor_argb,
 #else
 	.load_cursor_argb = intel_crtc_load_cursor_argb,