diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-07 08:23:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-07 08:23:46 +0200 |
| commit | 81fd17c8678e89cea6610b8b2996b028b21eb5dc (patch) | |
| tree | d2c201976b3cd000658870071ab7b533359de039 /xorg-server/fb | |
| parent | 5593a3d2f370e3e12a043110bf2e395c938980d6 (diff) | |
| download | vcxsrv-81fd17c8678e89cea6610b8b2996b028b21eb5dc.tar.gz vcxsrv-81fd17c8678e89cea6610b8b2996b028b21eb5dc.tar.bz2 vcxsrv-81fd17c8678e89cea6610b8b2996b028b21eb5dc.zip | |
xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013
xserver commit ccbe17b1c6da1ad9d085fc8133cdd15dc7004a4a
xkeyboard-config commit c8326b7d12b20eccfd38d661b95d9b23d8a56e27
libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854
pixman commit c89f4c826695dbb5df0817d84f845dbd3e28b7a7
fontconfig commit 604c2a683f1357fc65bad372b5d25a90099f827f
mesa commit cfbfb50cb8d47b7f6975828b504936f9324f3b12
Diffstat (limited to 'xorg-server/fb')
| -rw-r--r-- | xorg-server/fb/fb.h | 34 | ||||
| -rw-r--r-- | xorg-server/fb/fbcopy.c | 27 |
2 files changed, 0 insertions, 61 deletions
diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h index b869d122c..26957df4c 100644 --- a/xorg-server/fb/fb.h +++ b/xorg-server/fb/fb.h @@ -1111,17 +1111,6 @@ fbInitVisuals(VisualPtr * visualp, * fbcopy.c */ -/* Compatibility definition, to be removed at next ABI change. */ -typedef void (*fbCopyProc) (DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - GCPtr pGC, - BoxPtr pDstBox, - int nbox, - int dx, - int dy, - Bool reverse, - Bool upsidedown, Pixel bitplane, void *closure); - extern _X_EXPORT void fbCopyNtoN(DrawablePtr pSrcDrawable, @@ -1133,29 +1122,6 @@ fbCopyNtoN(DrawablePtr pSrcDrawable, int dy, Bool reverse, Bool upsidedown, 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, diff --git a/xorg-server/fb/fbcopy.c b/xorg-server/fb/fbcopy.c index e9c252a5e..541ef713b 100644 --- a/xorg-server/fb/fbcopy.c +++ b/xorg-server/fb/fbcopy.c @@ -28,33 +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, closure); -} - void fbCopyNtoN(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, |