more gcc2 breakage found by sparc

This commit is contained in:
todd 2009-01-20 23:13:14 +00:00
parent 5409a9c73b
commit 0a00651cd8
2 changed files with 9 additions and 5 deletions

View File

@ -408,8 +408,8 @@ ProcXF86DRIDestroyDrawable(
{ {
REQUEST(xXF86DRIDestroyDrawableReq); REQUEST(xXF86DRIDestroyDrawableReq);
DrawablePtr pDrawable; DrawablePtr pDrawable;
REQUEST_SIZE_MATCH(xXF86DRIDestroyDrawableReq);
int rc; int rc;
REQUEST_SIZE_MATCH(xXF86DRIDestroyDrawableReq);
if (stuff->screen >= screenInfo.numScreens) { if (stuff->screen >= screenInfo.numScreens) {
client->errorValue = stuff->screen; client->errorValue = stuff->screen;

View File

@ -117,9 +117,11 @@ static DevPrivateKey ShadowGCKey = &ShadowGCKey;
} }
#define SHADOW_GC_OP_PROLOGUE(pGC)\ #define SHADOW_GC_OP_PROLOGUE(pGC)\
ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pGC->pScreen); \ ShadowScreenPtr pPriv;\
ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);\ ShadowGCPtr pGCPriv;\
GCFuncs *oldFuncs = pGC->funcs;\ GCFuncs *oldFuncs = pGC->funcs;\
pGCPriv = GET_GC_PRIVATE(pGC);\
pPriv = GET_SCREEN_PRIVATE(pGC->pScreen);\
pGC->funcs = pGCPriv->funcs;\ pGC->funcs = pGCPriv->funcs;\
pGC->ops = pGCPriv->ops pGC->ops = pGCPriv->ops
@ -433,9 +435,11 @@ static Bool
ShadowCreateGC(GCPtr pGC) ShadowCreateGC(GCPtr pGC)
{ {
ScreenPtr pScreen = pGC->pScreen; ScreenPtr pScreen = pGC->pScreen;
ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen); ShadowScreenPtr pPriv;
ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC); ShadowGCPtr pGCPriv;
Bool ret; Bool ret;
pPriv = GET_SCREEN_PRIVATE(pScreen);
pGCPriv = GET_GC_PRIVATE(pGC);
pScreen->CreateGC = pPriv->CreateGC; pScreen->CreateGC = pPriv->CreateGC;
if((ret = (*pScreen->CreateGC) (pGC))) { if((ret = (*pScreen->CreateGC) (pGC))) {