diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2008-11-05 07:04:33 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2008-11-05 07:04:33 +0000 |
| commit | 0af5c3db69a9668006c463a0ca5668b7dcc3eda5 (patch) | |
| tree | 669c79047c1fb0a03dfcf6a0e670cf92f84d7671 | |
| parent | 46d1f8f375e8b0ec0297111ff91db7113e69111f (diff) | |
more gcc2 fixes courtesy sparc
| -rw-r--r-- | xserver/hw/xfree86/dri/xf86dri.c | 2 | ||||
| -rw-r--r-- | xserver/hw/xfree86/shadowfb/shadow.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xserver/hw/xfree86/dri/xf86dri.c b/xserver/hw/xfree86/dri/xf86dri.c index ea11b38ee..5fc560fc0 100644 --- a/xserver/hw/xfree86/dri/xf86dri.c +++ b/xserver/hw/xfree86/dri/xf86dri.c @@ -406,10 +406,10 @@ ProcXF86DRIDestroyDrawable( register ClientPtr client ) { + int rc; REQUEST(xXF86DRIDestroyDrawableReq); DrawablePtr pDrawable; REQUEST_SIZE_MATCH(xXF86DRIDestroyDrawableReq); - int rc; 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..6c904a713 100644 --- a/xserver/hw/xfree86/shadowfb/shadow.c +++ b/xserver/hw/xfree86/shadowfb/shadow.c @@ -117,9 +117,9 @@ static DevPrivateKey ShadowGCKey = &ShadowGCKey; } #define SHADOW_GC_OP_PROLOGUE(pGC)\ + GCFuncs *oldFuncs = pGC->funcs;\ ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pGC->pScreen); \ ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);\ - GCFuncs *oldFuncs = pGC->funcs;\ pGC->funcs = pGCPriv->funcs;\ pGC->ops = pGCPriv->ops @@ -432,10 +432,10 @@ extern GCOps ShadowGCOps; static Bool ShadowCreateGC(GCPtr pGC) { + Bool ret; ScreenPtr pScreen = pGC->pScreen; ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen); ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC); - Bool ret; pScreen->CreateGC = pPriv->CreateGC; if((ret = (*pScreen->CreateGC) (pGC))) { |