From aab76ad49dd7c0d9516be7681c14eed72786e101 Mon Sep 17 00:00:00 2001
From: Jens Granseuer <jensgr@gmx.net>
Date: Wed, 15 Aug 2007 18:17:44 +0000
Subject: Don't use #ifdef in macro expansion. Some compilers don't like that.

2007-08-15  Jens Granseuer  <jensgr@gmx.net>

	* backend/pdf/ev-poppler.cc:

	Don't use #ifdef in macro expansion. Some compilers don't
	like that. Closes bug #467042.

svn path=/trunk/; revision=2626
---
(limited to 'backend/pdf')

diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
index 38a96a5..8455411 100644
--- a/backend/pdf/ev-poppler.cc
+++ b/backend/pdf/ev-poppler.cc
@@ -126,6 +126,7 @@ static EvLink     *ev_link_from_action      (PdfDocument       *pdf_document,
 static void        pdf_document_search_free (PdfDocumentSearch *search);
 static void        pdf_print_context_free   (PdfPrintContext   *ctx);
 
+#ifdef HAVE_FORMS
 G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
                          {
 				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,
@@ -138,10 +139,8 @@ G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
 							pdf_document_document_links_iface_init);
 				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_IMAGES,
 							pdf_document_document_images_iface_init);
-#ifdef HAVE_FORMS
 				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FORMS,
 							pdf_document_document_forms_iface_init);
-#endif /* HAVE_FORMS */
 				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FONTS,
 							pdf_document_document_fonts_iface_init);
 				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND,
@@ -153,7 +152,31 @@ G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
 				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_TRANSITION,
 							pdf_document_page_transition_iface_init);
 			 });
-
+#else /* !HAVE_FORMS */
+G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT,
+                         {
+				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,
+							pdf_document_document_iface_init);
+				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_SECURITY,
+							pdf_document_security_iface_init);
+				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
+							pdf_document_document_thumbnails_iface_init);
+				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_LINKS,
+							pdf_document_document_links_iface_init);
+				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_IMAGES,
+							pdf_document_document_images_iface_init);
+				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FONTS,
+							pdf_document_document_fonts_iface_init);
+				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_FIND,
+							pdf_document_find_iface_init);
+				 G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
+							pdf_document_file_exporter_iface_init);
+				 G_IMPLEMENT_INTERFACE (EV_TYPE_SELECTION,
+							pdf_selection_iface_init);
+				 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_TRANSITION,
+							pdf_document_page_transition_iface_init);
+			 });
+#endif /* HAVE_FORMS */
 
 static void
 set_rc_data (PdfDocument     *pdf_document,
--
cgit v0.9.1