From: Karl Schultz Date: Wed, 7 Dec 2005 05:09:14 +0000 (+0000) Subject: Fix bugzilla 5253. Add {} around code in RENDER_SPAN macros when code includes a... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=98bebc7212a47f97ef6d15d4fca45a0fa608aea2;p=mesa.git Fix bugzilla 5253. Add {} around code in RENDER_SPAN macros when code includes a variable declaration. --- diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index 1e3d76874a3..056446b17b4 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -162,7 +162,7 @@ _swrast_culltriangle( GLcontext *ctx, return; \ } -#define RENDER_SPAN( span ) \ +#define RENDER_SPAN( span ) { \ GLuint i; \ span.intTex[0] -= FIXED_HALF; /* off-by-one error? */ \ span.intTex[1] -= FIXED_HALF; \ @@ -177,7 +177,7 @@ _swrast_culltriangle( GLcontext *ctx, span.intTex[0] += span.intTexStep[0]; \ span.intTex[1] += span.intTexStep[1]; \ } \ - rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL); + rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL); } #include "s_tritemp.h" @@ -213,7 +213,7 @@ _swrast_culltriangle( GLcontext *ctx, return; \ } -#define RENDER_SPAN( span ) \ +#define RENDER_SPAN( span ) { \ GLuint i; \ span.intTex[0] -= FIXED_HALF; /* off-by-one error? */ \ span.intTex[1] -= FIXED_HALF; \ @@ -238,7 +238,7 @@ _swrast_culltriangle( GLcontext *ctx, span.z += span.zStep; \ } \ rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, \ - span.array->rgb, span.array->mask); + span.array->rgb, span.array->mask); } #include "s_tritemp.h"