Ticket #18655: patch-goffice-0.6.6_goffice_cut-n-paste_foocanvas_foo-canvas-rect-ellipse.c.diff

goffice-0.6.6/goffice/cut-n-paste/foocanvas/

@@ -42 +42 @@
 #include <string.h>
 
 #ifdef HAVE_RENDER
+#ifdef HAVE_X
 #include <gdk/gdkx.h>
 #include <X11/extensions/Xrender.h>
-#endif
+#endif /* HAVE_X */
+#endif /* HAVE_RENDER */
 
 /* Base class for rectangle and ellipse item types */
 
@@ -766 +768 @@
         int last_outline_update_width;
 
 #ifdef HAVE_RENDER
+#ifdef HAVE_X
         gboolean use_render;
         XRenderPictFormat *format;
-#endif
+#endif /* HAVE_X */
+#endif /* HAVE_RENDER */
 };
 
 GType
@@ -838 +842 @@
 foo_canvas_rect_realize  (FooCanvasItem *item)
 {
 #ifdef HAVE_RENDER
+#ifdef HAVE_X
         FooCanvasRectPrivate *priv;
         int event_base, error_base;
         Display *dpy;
@@ -856 +861 @@
 
                 priv->format = XRenderFindVisualFormat (dpy, visual);
         }
-#endif
+#endif /* HAVE_X */
+#endif /* HAVE_RENDER */
 
         if (FOO_CANVAS_ITEM_CLASS (rect_parent_class)->realize) {
                 (* FOO_CANVAS_ITEM_CLASS (rect_parent_class)->realize) (item);
@@ -889 +895 @@
         a = (rgba >> 0) & 0xff;
 
 #ifdef HAVE_RENDER
+#ifdef HAVE_X
         /* Every visual is not guaranteed to have a matching
          * XRenderPictFormat. So make sure that format is not null before
          * trying to render using Xrender calls.
@@ -935 +942 @@
 
                 return;
         }
-#endif
+#endif /* HAVE_X */
+#endif /* HAVE_RENDER */
         pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
         data = gdk_pixbuf_get_pixels (pixbuf);
         rowstride = gdk_pixbuf_get_rowstride (pixbuf);