X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo-pager.h;h=8fa583d7e37b28a169d8365cc91e4101ca34c470;hb=39df27f80745cf9622ac5e916a098c17961c2585;hp=bd7fa55125115a0b5ab3377cd25af3d2990554cd;hpb=e333a444bba7a84682b26a68c0894a8ca4f353a4;p=pspp

diff --git a/src/output/cairo-pager.h b/src/output/cairo-pager.h
index bd7fa55125..8fa583d7e3 100644
--- a/src/output/cairo-pager.h
+++ b/src/output/cairo-pager.h
@@ -19,14 +19,12 @@
 
 #include <stdbool.h>
 
-#ifdef HAVE_CAIRO
-
 /* Cairo output driver paginater. */
 
 #include <cairo/cairo.h>
 #include <pango/pango-font.h>
 #include "output/cairo-fsm.h"
-#include "output/page-setup-item.h"
+#include "output/page-setup.h"
 #include "output/table.h"
 
 struct xr_page_style
@@ -38,7 +36,6 @@ struct xr_page_style
     struct page_heading headings[2]; /* Top and bottom headings. */
 
     int initial_page_number;
-    int object_spacing;
 
     /* Whether to include an outline in PDF output.  (The only reason I know to
        omit it is to avoid a Cairo bug that caused crashes in some cases.) */
@@ -70,6 +67,4 @@ void xr_pager_add_page (struct xr_pager *, cairo_t *);
 void xr_pager_finish_page (struct xr_pager *);
 bool xr_pager_needs_new_page (struct xr_pager *);
 
-#endif  /* HAVE_CAIRO */
-
 #endif /* output/cairo-pager.h */