Raise minimum supported Xserver version to 1.18 (ABI_VIDEODRV_VERSION 20.0)

Already effectively required by use of XNFcallocarray() introduced in
xorg/xserver@b96dc999 - xserver-1.18.0, released in Nov. 2015.

Allows dropping remnants of code for XAA and pre-pciaccess X servers

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-ast/-/merge_requests/9>

1 files changed, 0 insertions, 14 deletions

diff --git a/src/ast.h b/src/ast.h
index 1aa58c3..015f576 100644
--- a/src/ast.h
+++ b/src/ast.h
@@ -34,10 +34,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_XAA_H
-#include "xaa.h"
-#endif
-
 #include "ast_pcirename.h"
 
 #include "compat-api.h"
@@ -231,9 +227,6 @@ typedef struct _ASTRec {
     OptionInfoPtr 	Options;
     DisplayModePtr  ModePtr;
     FBLinearPtr 	pCMDQPtr;
-#ifdef HAVE_XAA_H
-    XAAInfoRecPtr	AccelInfoPtr;
-#endif
     xf86CursorInfoPtr   HWCInfoPtr;
     FBLinearPtr 	pHWCPtr;
 
@@ -266,11 +259,7 @@ typedef struct _ASTRec {
     unsigned long	FbMapSize;
     unsigned long	MMIOMapSize;
 
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-    IOADDRESS		RelocateIO;
-#else
     int			RelocateIO;
-#endif
 
     VIDEOMODE 		VideoModeInfo;
     ASTRegRec       SavedReg;
@@ -351,9 +340,6 @@ void ASTDisableHWC(ScrnInfoPtr pScrn);
 Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
 
 /* ast_accel.c */
-#ifdef HAVE_XAA_H
-Bool ASTAccelInit(ScreenPtr pScreen);
-#endif
 void ASTDisplayVideo(ScrnInfoPtr pScrn, ASTPortPrivPtr pPriv, RegionPtr clipBoxes, int id);
 
 /* ast_tool.c */