diff options
| -rw-r--r-- | xserver/hw/xfree86/dri/xf86dri.c | 2 | ||||
| -rw-r--r-- | xserver/hw/xfree86/shadowfb/shadow.c | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/xserver/hw/xfree86/dri/xf86dri.c b/xserver/hw/xfree86/dri/xf86dri.c index ea11b38ee..2c402643d 100644 --- a/xserver/hw/xfree86/dri/xf86dri.c +++ b/xserver/hw/xfree86/dri/xf86dri.c @@ -408,8 +408,8 @@ ProcXF86DRIDestroyDrawable( { REQUEST(xXF86DRIDestroyDrawableReq); DrawablePtr pDrawable; - REQUEST_SIZE_MATCH(xXF86DRIDestroyDrawableReq); int rc; + REQUEST_SIZE_MATCH(xXF86DRIDestroyDrawableReq); if (stuff->screen >= screenInfo.numScreens) { client->errorValue = stuff->screen; diff --git a/xserver/hw/xfree86/shadowfb/shadow.c b/xserver/hw/xfree86/shadowfb/shadow.c index 74beefb67..78e10913f 100644 --- a/xserver/hw/xfree86/shadowfb/shadow.c +++ b/xserver/hw/xfree86/shadowfb/shadow.c @@ -117,9 +117,11 @@ static DevPrivateKey ShadowGCKey = &ShadowGCKey; } #define SHADOW_GC_OP_PROLOGUE(pGC)\ - ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pGC->pScreen); \ - ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);\ + ShadowScreenPtr pPriv;\ + ShadowGCPtr pGCPriv;\ GCFuncs *oldFuncs = pGC->funcs;\ + pGCPriv = GET_GC_PRIVATE(pGC);\ + pPriv = GET_SCREEN_PRIVATE(pGC->pScreen);\ pGC->funcs = pGCPriv->funcs;\ pGC->ops = pGCPriv->ops @@ -433,9 +435,11 @@ static Bool ShadowCreateGC(GCPtr pGC) { ScreenPtr pScreen = pGC->pScreen; - ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen); - ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC); + ShadowScreenPtr pPriv; + ShadowGCPtr pGCPriv; Bool ret; + pPriv = GET_SCREEN_PRIVATE(pScreen); + pGCPriv = GET_GC_PRIVATE(pGC); pScreen->CreateGC = pPriv->CreateGC; if((ret = (*pScreen->CreateGC) (pGC))) { |