3 files changed, 0 insertions, 51 deletions
diff --git a/src/compat-api.h b/src/compat-api.h
index 89976e4..cc5b57b 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -28,45 +28,6 @@
 #ifndef COMPAT_API_H
 #define COMPAT_API_H
 
-#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
-#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
-#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
-#endif
-
-#ifndef XF86_HAS_SCRN_CONV
-#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
-#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
-#endif
-
-#ifndef XF86_SCRN_INTERFACE
-
-#define SCRN_ARG_TYPE int
-#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
-
-#define SCREEN_ARG_TYPE int
-#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
-
-#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
-
-#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
-#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
-
-#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
-#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
-
-#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
-#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
-
-#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
-#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
-
-#define FREE_SCREEN_ARGS_DECL int arg, int flags
-
-#define VT_FUNC_ARGS_DECL int arg, int flags
-#define VT_FUNC_ARGS pScrn->scrnIndex, 0
-
-#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
-#else
 #define SCRN_ARG_TYPE ScrnInfoPtr
 #define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
 
@@ -100,5 +61,3 @@
 #define XF86_SCRN_ARG(x) (x)
 
 #endif
-
-#endif
diff --git a/src/smi_crtc.c b/src/smi_crtc.c
index 59c4552..db93568 100644
--- a/src/smi_crtc.c
+++ b/src/smi_crtc.c
@@ -210,13 +210,6 @@ SMI_CrtcConfigResize(ScrnInfoPtr       pScrn,
 	pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
 					   -1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset);
 
-#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
-	if(pScrn->pixmapPrivate.ptr)
-	    /* The pixmap devPrivate just set may be overwritten by
-	       xf86EnableDisableFBAccess */
-	    pScrn->pixmapPrivate.ptr = pSmi->FBBase + pSmi->FBOffset;
-#endif
-
 	/* Modify the screen pitch */
 	pScrn->displayWidth = aligned_pitch / pSmi->Bpp;
 	pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
diff --git a/src/smi_driver.c b/src/smi_driver.c
index 5f39e96..d6f8dfb 100644
--- a/src/smi_driver.c
+++ b/src/smi_driver.c
@@ -924,9 +924,6 @@ SMI_EnterVT(VT_FUNC_ARGS_DECL)
     /* FBBase may have changed after remapping the memory */
     pScrn->pScreen->ModifyPixmapHeader(pScrn->pScreen->GetScreenPixmap(pScrn->pScreen),
 				       -1,-1,-1,-1,-1, pSmi->FBBase + pSmi->FBOffset);
-#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
-    pScrn->pixmapPrivate.ptr=pSmi->FBBase + pSmi->FBOffset;
-#endif
 
     if(pSmi->useEXA)
        pSmi->EXADriverPtr->memoryBase=pSmi->FBBase;