Remove nasty function pointer type from DevUnion, return to documented type.
This commit is contained in:
parent
f452507ca9
commit
2534f5a902
|
@ -50,7 +50,6 @@ SOFTWARE.
|
||||||
|
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include <X11/Xprotostr.h>
|
#include <X11/Xprotostr.h>
|
||||||
#include "gc.h"
|
|
||||||
|
|
||||||
typedef xPoint DDXPointRec;
|
typedef xPoint DDXPointRec;
|
||||||
|
|
||||||
|
@ -62,17 +61,7 @@ typedef union _DevUnion {
|
||||||
pointer ptr;
|
pointer ptr;
|
||||||
long val;
|
long val;
|
||||||
unsigned long uval;
|
unsigned long uval;
|
||||||
RegionPtr (*fptr)(
|
pointer (*fptr)(void);
|
||||||
DrawablePtr /* pSrcDrawable */,
|
|
||||||
DrawablePtr /* pDstDrawable */,
|
|
||||||
GCPtr /* pGC */,
|
|
||||||
int /* srcx */,
|
|
||||||
int /* srcy */,
|
|
||||||
int /* width */,
|
|
||||||
int /* height */,
|
|
||||||
int /* dstx */,
|
|
||||||
int /* dsty */,
|
|
||||||
unsigned long /* bitPlane */);
|
|
||||||
} DevUnion;
|
} DevUnion;
|
||||||
|
|
||||||
#endif /* MISCSTRUCT_H */
|
#endif /* MISCSTRUCT_H */
|
||||||
|
|
|
@ -400,20 +400,22 @@ int dstx, dsty;
|
||||||
static unsigned long copyPlaneGeneration;
|
static unsigned long copyPlaneGeneration;
|
||||||
static int copyPlaneScreenIndex = -1;
|
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
|
Bool
|
||||||
mfbRegisterCopyPlaneProc (pScreen, proc)
|
mfbRegisterCopyPlaneProc (pScreen, proc)
|
||||||
ScreenPtr pScreen;
|
ScreenPtr pScreen;
|
||||||
RegionPtr (*proc)(
|
CopyPlaneFuncPtr proc;
|
||||||
DrawablePtr /* pSrcDrawable */,
|
|
||||||
DrawablePtr /* pDstDrawable */,
|
|
||||||
GCPtr /* pGC */,
|
|
||||||
int /* srcx */,
|
|
||||||
int /* srcy */,
|
|
||||||
int /* width */,
|
|
||||||
int /* height */,
|
|
||||||
int /* dstx */,
|
|
||||||
int /* dsty */,
|
|
||||||
unsigned long /* bitPlane */);
|
|
||||||
{
|
{
|
||||||
if (copyPlaneGeneration != serverGeneration)
|
if (copyPlaneGeneration != serverGeneration)
|
||||||
{
|
{
|
||||||
|
@ -422,7 +424,7 @@ mfbRegisterCopyPlaneProc (pScreen, proc)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
copyPlaneGeneration = serverGeneration;
|
copyPlaneGeneration = serverGeneration;
|
||||||
}
|
}
|
||||||
pScreen->devPrivates[copyPlaneScreenIndex].fptr = proc;
|
pScreen->devPrivates[copyPlaneScreenIndex].fptr = (CopyPlaneFuncPtr)proc;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -468,7 +470,7 @@ unsigned long plane;
|
||||||
if (pSrcDrawable->depth != 1)
|
if (pSrcDrawable->depth != 1)
|
||||||
{
|
{
|
||||||
if (copyPlaneScreenIndex >= 0 &&
|
if (copyPlaneScreenIndex >= 0 &&
|
||||||
(copyPlane =
|
(copyPlane = (CopyPlaneFuncPtr)
|
||||||
pSrcDrawable->pScreen->devPrivates[copyPlaneScreenIndex].fptr)
|
pSrcDrawable->pScreen->devPrivates[copyPlaneScreenIndex].fptr)
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user