xserver: Branch 'XACE-SELINUX' - 3 commits
Eamon Walsh
ewalsh at kemper.freedesktop.org
Tue Nov 20 14:26:02 PST 2007
Xext/xres.c | 1 -
cfb/cfb.h | 2 ++
dix/main.c | 1 -
fb/fb.h | 1 -
mfb/mfbbitblt.c | 30 +++++++++++++-----------------
5 files changed, 15 insertions(+), 20 deletions(-)
New commits:
commit fae39db7957c0ebdc7af36f8d8f484473beb6d38
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 15:21:31 2007 -0500
devPrivates rework: put back some changes that were mistakenly removed
during merge conflict resolution.
diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c
index 0c23ba7..344c655 100644
--- a/mfb/mfbbitblt.c
+++ b/mfb/mfbbitblt.c
@@ -399,22 +399,20 @@ int dstx, dsty;
static DevPrivateKey copyPlaneScreenKey = ©PlaneScreenKey;
-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;
- CopyPlaneFuncPtr proc;
+ RegionPtr (*proc)(
+ DrawablePtr /* pSrcDrawable */,
+ DrawablePtr /* pDstDrawable */,
+ GCPtr /* pGC */,
+ int /* srcx */,
+ int /* srcy */,
+ int /* width */,
+ int /* height */,
+ int /* dstx */,
+ int /* dsty */,
+ unsigned long /* bitPlane */);
{
dixSetPrivate(&pScreen->devPrivates, copyPlaneScreenKey, proc);
return TRUE;
@@ -461,10 +459,8 @@ unsigned long plane;
if (pSrcDrawable->depth != 1)
{
- if ((copyPlane = (CopyPlaneFuncPtr)
- dixLookupPrivate(&pSrcDrawable->pScreen->devPrivates,
- copyPlaneScreenKey))
- )
+ if ((copyPlane = dixLookupPrivate(&pSrcDrawable->pScreen->devPrivates,
+ copyPlaneScreenKey)))
{
return (*copyPlane) (pSrcDrawable, pDstDrawable,
pGC, srcx, srcy, width, height, dstx, dsty, plane);
commit 709c1a70c8c6a9e132bf0d92f78a12be72beee51
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 15:18:02 2007 -0500
Remove some duplicate include statements.
diff --git a/Xext/xres.c b/Xext/xres.c
index 281ba20..efa6c49 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -23,7 +23,6 @@
#include "windowstr.h"
#include "gcstruct.h"
#include "modinit.h"
-#include "registry.h"
static int
ProcXResQueryVersion (ClientPtr client)
diff --git a/dix/main.c b/dix/main.c
index bc00ac5..335706b 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -87,7 +87,6 @@ Equipment Corporation.
#include "os.h"
#include "windowstr.h"
#include "resource.h"
-#include "privates.h"
#include "dixstruct.h"
#include "gcstruct.h"
#include "extension.h"
diff --git a/fb/fb.h b/fb/fb.h
index af2b4a1..5b56d96 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -41,7 +41,6 @@
#include "mi.h"
#include "migc.h"
#include "mibstore.h"
-#include "privates.h"
#ifdef RENDER
#include "picturestr.h"
#else
commit 5b0dfb73ca4699cc4b33720f10416de7440081b7
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Mon Nov 19 21:01:22 2007 -0500
devPrivates rework: put back a comment that was mistakenly removed
during merge conflict resolution.
diff --git a/cfb/cfb.h b/cfb/cfb.h
index e80a427..aece133 100644
--- a/cfb/cfb.h
+++ b/cfb/cfb.h
@@ -81,6 +81,8 @@ typedef struct {
CfbBits xor, and;
} cfbRRopRec, *cfbRRopPtr;
+/* cfb8bit.c */
+
extern int cfbSetStipple(
int /*alu*/,
CfbBits /*fg*/,
More information about the xorg-commit
mailing list