diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-02 09:25:01 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-02 09:26:05 +0100 |
| commit | 454367f5945dd17a7cfc566b1986654fc976cabe (patch) | |
| tree | 63e2e4851593bcc0c0bf96189ce1d6250e220d4a | |
| parent | ff36e1f7546e0ac4d6e831e5cf8d1317792ed7af (diff) | |
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@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_display.c | 2 | ||||
| -rw-r--r-- | src/uxa/intel_display.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index 62dce47f..13dbf641 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 4a41d4d1..95ddcc83 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, |