Merge branch 'mesa_7_7_branch'

[mesa.git] / src / mesa / drivers / dri / ffb / ffb_bitmap.c

diff --git a/src/mesa/drivers/dri/ffb/ffb_bitmap.c b/src/mesa/drivers/dri/ffb/ffb_bitmap.c
index f89c0412dfe15e52f9f204ab6a4a9415be085234..b71a552c9dc6a0f6eafb23e385976dca0fec96c0 100644 (file)
--- a/src/mesa/drivers/dri/ffb/ffb_bitmap.c
+++ b/src/mesa/drivers/dri/ffb/ffb_bitmap.c
@@ -30,7 +30,6 @@
 #include "ffb_lock.h"
 #include "ffb_bitmap.h"
 #include "swrast/swrast.h"
-#include "main/image.h"
 #include "main/macros.h"
 
 /* Compute ceiling of integer quotient of A divided by B: */
@@ -46,7 +45,7 @@ ffb_bitmap(GLcontext *ctx, GLint px, GLint py,
 {
        ffbContextPtr fmesa = FFB_CONTEXT(ctx);
        ffb_fbcPtr ffb = fmesa->regs;
-       __DRIdrawablePrivate *dPriv = fmesa->driDrawable;
+       __DRIdrawable *dPriv = fmesa->driDrawable;
        unsigned int ppc, pixel;
        GLint row, col, row_stride;
        const GLubyte *src;