output-item: Make command name part of every output_item.

[pspp] / src / output / image-item.h

diff --git a/src/output/image-item.h b/src/output/image-item.h
index 91d7c2e131f26cc554d05c2a0e24e5ae194ab8ae..4cb3614ba479206e671c34f21f66dd94f5b74712 100644 (file)
--- a/src/output/image-item.h
+++ b/src/output/image-item.h
@@ -17,24 +17,17 @@
 #ifndef OUTPUT_IMAGE_ITEM_H
 #define OUTPUT_IMAGE_ITEM_H 1
 
-#ifdef HAVE_CAIRO
 #include <cairo.h>
-#endif
 #include <stdbool.h>
 #include "output/output-item.h"
 
 struct image_item
   {
     struct output_item output_item; /* Superclass */
-#ifdef HAVE_CAIRO
     cairo_surface_t *image;
-#endif
   };
 
-#ifdef HAVE_CAIRO
 struct image_item *image_item_create (cairo_surface_t *);
-#endif
-
 struct image_item *image_item_unshare (struct image_item *);
 \f
 /* This boilerplate for image_item, a subclass of output_item, was