summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-07-25 18:57:28 +0200
committerTor Lillqvist <tml@collabora.com>2019-10-21 21:08:26 +0200
commita2fea518f66390f316a0b52cae4f64dfd1cbd9f4 (patch)
tree61c8d282a139b2094612bd8c52e1c099e4dc4410
parent51930c74aa14b92323510c2b560b5f3456ab91e3 (diff)
No bad macros from windows.h in external/pdfium (Windows --disable-pch)
Change-Id: I036b6b8974481a59b6869115f216949a455451d0 Reviewed-on: https://gerrit.libreoffice.org/58003 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 81f06a142d3228a97341d0728d2aff761b5fd5a2) Reviewed-on: https://gerrit.libreoffice.org/81264 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--svx/source/svdraw/svdpdf.hxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx
index df8eac35bbe7..fd97768dc233 100644
--- a/svx/source/svdraw/svdpdf.hxx
+++ b/svx/source/svdraw/svdpdf.hxx
@@ -35,6 +35,10 @@
#include <svx/xdash.hxx>
#include <com/sun/star/uno/Sequence.hxx>
+// Prevent workdir/UnpackedTarball/pdfium/public/fpdfview.h from including windows.h in a way that
+// it will define e.g. Yield as a macro:
+#include <prewin.h>
+#include <postwin.h>
#include <fpdfview.h>
// Forward Declarations