mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build with poppler-0.21.1

Browse Source 
heh, they put back UTF8.h

Change-Id: Id915b1a1e41440a4b53058779355e99e3592e5fa
This commit is contained in:
Petr Mladek
2012-11-21 17:37:26 +01:00
parent 3ef3601f79
commit 397f3e5d7b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
View File

@@ -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"