--- src/glx/dri_glx.c	2010-07-25 11:12:56.430864644 +0200
+++ src/glx/dri_glx.c.new	2010-07-25 11:15:36.373614489 +0200
@@ -82,7 +82,6 @@
    __GLXDRIcontext dri_vtable;
    __DRIcontext *driContext;
    XID hwContextID;
-   __GLXscreenConfigs *psc;
 };
 
 struct dri_drawable
@@ -524,7 +523,7 @@
 	       __GLXDRIdrawable *draw, __GLXDRIdrawable *read)
 {
    struct dri_context *pcp = (struct dri_context *) context;
-   struct dri_screen *psc = (struct dri_screen *) pcp->psc;
+   struct dri_screen *psc = (struct dri_screen *) pcp->base.psc;
    struct dri_drawable *pdr = (struct dri_drawable *) draw;
    struct dri_drawable *prd = (struct dri_drawable *) read;
 
@@ -536,7 +535,7 @@
 driUnbindContext(__GLXcontext * context)
 {
    struct dri_context *pcp = (struct dri_context *) context;
-   struct dri_screen *psc = (struct dri_screen *) pcp->psc;
+   struct dri_screen *psc = (struct dri_screen *) pcp->base.psc;
 
    (*psc->core->unbindContext) (pcp->driContext);
 }