Remove checking of LATEST_XORG.

Change-Id: I96de5f44f81fcd5fcfca1b40e89e48aa74e13ae9

diff --git a/configure.ac b/configure.ac
index d850d73..7e15d6c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -45,13 +45,8 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(PROTO, [xproto fontsproto])
 
-if pkg-config --exists 'xorg-server >= 1.15.0'; then
-       AC_DEFINE([LATEST_XORG], 1, [define for backward compatibility with old xorg-server])
-fi
-
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
-
 ftests=no
 FT_CFLAGS=""
 FT_LIBS=""

diff --git a/src/crtcconfig/sec_crtc.c b/src/crtcconfig/sec_crtc.c
index 32f1501..93eb933 100644 (file)
--- a/src/crtcconfig/sec_crtc.c
+++ b/src/crtcconfig/sec_crtc.c
@@ -1419,22 +1419,14 @@ SECCrtcHideCursor (xf86CrtcPtr pCrtc)
     _cursorHide (pCrtc);
 }
 
-#ifdef LATEST_XORG
-static Bool
-#else
 static void
-#endif
 SECCrtcLoadCursorArgb(xf86CrtcPtr pCrtc, CARD32 *image)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
 
     if (pCrtcPriv == NULL || image == NULL)
     {
-#ifdef LATEST_XORG
-        return FALSE;
-#else
        return;
-#endif
     }
     XDBG_TRACE (MCRS, "[%p] image(%p) \n", pCrtc, image);
 
@@ -1446,12 +1438,7 @@ SECCrtcLoadCursorArgb(xf86CrtcPtr pCrtc, CARD32 *image)
                                      , NULL
                                      , 0);
 
-#ifdef LATEST_XORG
-    XDBG_RETURN_VAL_IF_FAIL (pCrtcPriv->backup_image != NULL, FALSE);
-#else
     XDBG_RETURN_IF_FAIL (pCrtcPriv->backup_image != NULL);
-#endif
-
 
     memcpy (pixman_image_get_data(pCrtcPriv->backup_image), image, SEC_CURSOR_W * SEC_CURSOR_H * 4);
 
@@ -1462,9 +1449,6 @@ SECCrtcLoadCursorArgb(xf86CrtcPtr pCrtc, CARD32 *image)
     }
 
     pCrtcPriv->need_cursor_update = TRUE;
-#ifdef LATEST_XORG
-    return TRUE;
-#endif
 }
 
 

diff --git a/src/crtcconfig/sec_dummy.c b/src/crtcconfig/sec_dummy.c
index 38c9990..51ff491 100644 (file)
--- a/src/crtcconfig/sec_dummy.c
+++ b/src/crtcconfig/sec_dummy.c
@@ -502,19 +502,11 @@ SECDummyCrtcHideCursor (xf86CrtcPtr pCrtc)
     return;
 }
 
-#ifdef LATEST_XORG
-static Bool
-#else
 static void
-#endif
 SECDummyCrtcLoadCursorArgb(xf86CrtcPtr pCrtc, CARD32 *image)
 {
     XDBG_TRACE (MDOUT, "[%p]  \n", pCrtc);
-#ifdef LATEST_XORG
-    return TRUE;
-#else
     return;
-#endif
 }
 
 static const xf86CrtcFuncsRec sec_crtc_dummy_funcs =