$NetBSD$

--- src/cairo-gl-surface.c.orig	2010-09-02 11:38:55.000000000 +0000
+++ src/cairo-gl-surface.c
@@ -776,10 +776,10 @@ _cairo_gl_surface_finish (void *abstract
         return status;
 
     if (ctx->operands[CAIRO_GL_TEX_SOURCE].type == CAIRO_GL_OPERAND_TEXTURE &&
-        ctx->operands[CAIRO_GL_TEX_SOURCE].texture.surface == surface)
+        ctx->operands[CAIRO_GL_TEX_SOURCE].A.texture.surface == surface)
         _cairo_gl_context_destroy_operand (ctx, CAIRO_GL_TEX_SOURCE);
     if (ctx->operands[CAIRO_GL_TEX_MASK].type == CAIRO_GL_OPERAND_TEXTURE &&
-        ctx->operands[CAIRO_GL_TEX_MASK].texture.surface == surface)
+        ctx->operands[CAIRO_GL_TEX_MASK].A.texture.surface == surface)
         _cairo_gl_context_destroy_operand (ctx, CAIRO_GL_TEX_MASK);
     if (ctx->current_target == surface)
 	ctx->current_target = NULL;
@@ -1382,9 +1382,9 @@ _cairo_gl_surface_flush (void *abstract_
         return status;
 
     if ((ctx->operands[CAIRO_GL_TEX_SOURCE].type == CAIRO_GL_OPERAND_TEXTURE &&
-         ctx->operands[CAIRO_GL_TEX_SOURCE].texture.surface == surface) ||
+         ctx->operands[CAIRO_GL_TEX_SOURCE].A.texture.surface == surface) ||
         (ctx->operands[CAIRO_GL_TEX_MASK].type == CAIRO_GL_OPERAND_TEXTURE &&
-         ctx->operands[CAIRO_GL_TEX_MASK].texture.surface == surface) ||
+         ctx->operands[CAIRO_GL_TEX_MASK].A.texture.surface == surface) ||
         (ctx->current_target == surface))
       _cairo_gl_composite_flush (ctx);