From 53792745b2adff8b002726bd3db97b33a5cdf07c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 1 Oct 2011 12:42:02 -0600
Subject: [PATCH] ...

---
 src/calibre/ebooks/pdf/reflow.cpp | 4 ----
 src/calibre/ebooks/pdf/reflow.h   | 7 +++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/calibre/ebooks/pdf/reflow.cpp b/src/calibre/ebooks/pdf/reflow.cpp
index 8103e1a03d..552e13efcb 100644
--- a/src/calibre/ebooks/pdf/reflow.cpp
+++ b/src/calibre/ebooks/pdf/reflow.cpp
@@ -625,11 +625,7 @@ static string get_link_dest(LinkAction *link, PDFDoc *doc) {
   return oss.str();
 }
 
-#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17)
-void XMLOutputDev::process_link(Link* link){
-#else
 void XMLOutputDev::process_link(AnnotLink* link){
-#endif
 
   double _x1, _y1, _x2, _y2;
   int x1, y1, x2, y2;
diff --git a/src/calibre/ebooks/pdf/reflow.h b/src/calibre/ebooks/pdf/reflow.h
index d99137d376..6eb24bcb11 100644
--- a/src/calibre/ebooks/pdf/reflow.h
+++ b/src/calibre/ebooks/pdf/reflow.h
@@ -41,6 +41,9 @@ using namespace std;
 
 namespace calibre_reflow {
 
+#ifndef AnnotLink
+#define AnnotLink Link
+#endif
 
 enum UnicodeTextDirection {
   text_dir_unknown,
@@ -244,11 +247,7 @@ class XMLOutputDev : public OutputDev {
     XMLImages *images;
     PDFDoc *doc;
 
-#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17)
-    void process_link(Link* link);
-#else
     void process_link(AnnotLink* link);
-#endif
 
 };
 }