[PATCH] rootless: change the last calls to compatibility wrapper fbCopyRegion()

[Colin Harrison]

Hi,

As a PS to the rootless patch, in the first message, the following cleanup
can now be made in the xserver...

--- ./fb/save_fb.h      2010-06-06 06:21:44.000000000 +0100
+++ ./fb/fb.h   2010-07-16 21:12:22.000000000 +0100
@@ -1345,33 +1345,6 @@
            Pixel       bitplane,
            void        *closure);

-/* Compatibility wrapper, to be removed at next ABI change. */
-extern _X_EXPORT void
-fbCopyRegion (DrawablePtr   pSrcDrawable,
-             DrawablePtr   pDstDrawable,
-             GCPtr         pGC,
-             RegionPtr     pDstRegion,
-             int           dx,
-             int           dy,
-             fbCopyProc    copyProc,
-             Pixel         bitPlane,
-             void          *closure);
-
-/* Compatibility wrapper, to be removed at next ABI change. */
-extern _X_EXPORT RegionPtr
-fbDoCopy (DrawablePtr  pSrcDrawable,
-         DrawablePtr   pDstDrawable,
-         GCPtr         pGC,
-         int           xIn,
-         int           yIn,
-         int           widthSrc,
-         int           heightSrc,
-         int           xOut,
-         int           yOut,
-         fbCopyProc    copyProc,
-         Pixel         bitplane,
-         void          *closure);
-
 extern _X_EXPORT void
 fbCopy1toN (DrawablePtr        pSrcDrawable,
            DrawablePtr pDstDrawable,

--- ./fb/save_fbcopy.c  2010-05-20 17:31:07.000000000 +0100
+++ ./fb/fbcopy.c       2010-07-16 21:13:15.000000000 +0100
@@ -28,39 +28,6 @@

 #include "fb.h"

-/* Compatibility wrapper, to be removed at next ABI change. */
-void
-fbCopyRegion (DrawablePtr   pSrcDrawable,
-             DrawablePtr   pDstDrawable,
-             GCPtr         pGC,
-             RegionPtr     pDstRegion,
-             int           dx,
-             int           dy,
-             fbCopyProc    copyProc,
-             Pixel         bitPlane,
-             void          *closure)
-{
-    miCopyRegion(pSrcDrawable, pDstDrawable, pGC, pDstRegion, dx, dy,
copyProc, bitPlane, closure);
-}
-
-/* Compatibility wrapper, to be removed at next ABI change. */
-RegionPtr
-fbDoCopy (DrawablePtr  pSrcDrawable,
-         DrawablePtr   pDstDrawable,
-         GCPtr         pGC,
-         int           xIn,
-         int           yIn,
-         int           widthSrc,
-         int           heightSrc,
-         int           xOut,
-         int           yOut,
-         fbCopyProc    copyProc,
-         Pixel         bitPlane,
-         void          *closure)
-{
-    return miDoCopy(pSrcDrawable, pDstDrawable, pGC, xIn, yIn, widthSrc,
heightSrc, xOut, yOut, copyProc, bitPlane, closu
re);
-}
-
 void
 fbCopyNtoN (DrawablePtr        pSrcDrawable,
            DrawablePtr pDstDrawable,

--- ./fb/save_wfbrename.h       2010-06-06 06:02:02.000000000 +0100
+++ ./fb/wfbrename.h    2010-07-16 21:14:26.000000000 +0100
@@ -58,7 +58,6 @@
 #define fbCopyNto1 wfbCopyNto1
 #define fbCopyNtoN wfbCopyNtoN
 #define fbCopyPlane wfbCopyPlane
-#define fbCopyRegion wfbCopyRegion
 #define fbCopyWindow wfbCopyWindow
 #define fbCopyWindowProc wfbCopyWindowProc
 #define fbCreateDefColormap wfbCreateDefColormap
@@ -68,7 +67,6 @@
 #define fbCreateWindow wfbCreateWindow
 #define fbDestroyPixmap wfbDestroyPixmap
 #define fbDestroyWindow wfbDestroyWindow
-#define fbDoCopy wfbDoCopy
 #define fbDots wfbDots
 #define fbDots16 wfbDots16
 #define fbDots24 wfbDots24

Thanks,
Colin Harrison