more gcc2 fixes courtesy sparc

This commit is contained in:
todd 2008-11-05 07:04:31 +00:00
parent 51ad66e69b
commit 519385f8fc
2 changed files with 3 additions and 3 deletions

View File

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

View File

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