frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove nasty function pointer type from DevUnion, return to documented type.

This commit is contained in:
Eamon Walsh 2007-02-16 15:33:48 -05:00 committed by Eamon Walsh
parent f452507ca9
commit 2534f5a902
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/miscstruct.h
View File

@ -50,7 +50,6 @@ SOFTWARE.
#include "misc.h"
#include <X11/Xprotostr.h>
#include "gc.h"
typedef xPoint DDXPointRec;
@ -62,17 +61,7 @@ typedef union _DevUnion {
pointer ptr;
long val;
unsigned long uval;
RegionPtr (*fptr)(
DrawablePtr /* pSrcDrawable */,
DrawablePtr /* pDstDrawable */,
GCPtr /* pGC */,
int /* srcx */,
int /* srcy */,
int /* width */,
int /* height */,
int /* dstx */,
int /* dsty */,
unsigned long /* bitPlane */);
pointer (*fptr)(void);
} DevUnion;
#endif /* MISCSTRUCT_H */

28
mfb/mfbbitblt.c
View File

@ -400,20 +400,22 @@ int dstx, dsty;
static unsigned long copyPlaneGeneration;
static int copyPlaneScreenIndex = -1;
typedef RegionPtr (*CopyPlaneFuncPtr)(
DrawablePtr /* pSrcDrawable */,
DrawablePtr /* pDstDrawable */,
GCPtr /* pGC */,
int /* srcx */,
int /* srcy */,
int /* width */,
int /* height */,
int /* dstx */,
int /* dsty */,
unsigned long /* bitPlane */);
Bool
mfbRegisterCopyPlaneProc (pScreen, proc)
ScreenPtr pScreen;
RegionPtr (*proc)(
DrawablePtr /* pSrcDrawable */,
DrawablePtr /* pDstDrawable */,
GCPtr /* pGC */,
int /* srcx */,
int /* srcy */,
int /* width */,
int /* height */,
int /* dstx */,
int /* dsty */,
unsigned long /* bitPlane */);
CopyPlaneFuncPtr proc;
{
if (copyPlaneGeneration != serverGeneration)
{
@ -422,7 +424,7 @@ mfbRegisterCopyPlaneProc (pScreen, proc)
return FALSE;
copyPlaneGeneration = serverGeneration;
}
pScreen->devPrivates[copyPlaneScreenIndex].fptr = proc;
pScreen->devPrivates[copyPlaneScreenIndex].fptr = (CopyPlaneFuncPtr)proc;
return TRUE;
}
@ -468,7 +470,7 @@ unsigned long plane;
if (pSrcDrawable->depth != 1)
{
if (copyPlaneScreenIndex >= 0 &&
(copyPlane =
(copyPlane = (CopyPlaneFuncPtr)
pSrcDrawable->pScreen->devPrivates[copyPlaneScreenIndex].fptr)
)
{