diff options
| author | Petr Mladek <pmladek@suse.cz> | 2012-11-21 17:37:26 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-11-21 17:39:06 +0100 |
| commit | 397f3e5d7b0b079ef3a6ef4b859ea2b2ab814b67 (patch) | |
| tree | e3eb69a4aa556a988f02a4057f332a0158bdc57b /sdext | |
| parent | 3ef3601f79ed6df6e000002e207eac13666c53d4 (diff) | |
fix build with poppler-0.21.1
heh, they put back UTF8.h
Change-Id: Id915b1a1e41440a4b53058779355e99e3592e5fa
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index 7adc48718d28..765d0be21537 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -34,7 +34,12 @@ #pragma warning(push, 1) #endif -#if POPPLER_CHECK_VERSION(0, 21, 0) +// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1 +// FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1) +// because the internal poppler does not provide poppler-version.h and the macro always returns 0 +#if POPPLER_CHECK_VERSION(0, 21, 1) +#include "UTF8.h" +#elif POPPLER_CHECK_VERSION(0, 21, 0) #include "UTF.h" #else #include "UTF8.h" |