diff -ru Mesa-6.4-orig/src/mesa/drivers/windows/gdi/wmesa.c Mesa-6.4/src/mesa/drivers/windows/gdi/wmesa.c
--- Mesa-6.4-orig/src/mesa/drivers/windows/gdi/wmesa.c	2005-11-04 21:40:15.000000000 +0100
+++ Mesa-6.4/src/mesa/drivers/windows/gdi/wmesa.c	2005-11-04 21:40:47.000000000 +0100
@@ -105,7 +105,7 @@
     return TRUE;
 }
 
-static wmDeleteBackingStore(PWMC pwc)
+static void wmDeleteBackingStore(PWMC pwc)
 {
     if (pwc->hbmDIB) {
 	SelectObject(pwc->dib.hDC, pwc->hOldBitmap);
@@ -1097,8 +1097,8 @@
 	rb->PutMonoValues = write_mono_rgba_pixels_single;
 	rb->GetRow = read_rgba_span_single;
 	rb->GetValues = read_rgba_pixels_single;
-	_mesa_add_renderbuffer(c->gl_buffer, BUFFER_FRONT_LEFT, rb);
     }
+    _mesa_add_renderbuffer(c->gl_buffer, BUFFER_FRONT_LEFT, rb);
 
     _mesa_add_soft_renderbuffers(c->gl_buffer,
 				 GL_FALSE, /* color */
@@ -1159,7 +1159,7 @@
     if (Current == c)
 	return;
     
-    if (Current = c)
+    if ((Current = c) != 0)
 	_mesa_make_current(c->gl_ctx, c->gl_buffer, c->gl_buffer);
 }