[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - svx/source

[Stephan Bergmann (via logerrit)]

 svx/source/svdraw/svdpdf.hxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit a2fea518f66390f316a0b52cae4f64dfd1cbd9f4
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jul 25 18:57:28 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Oct 21 21:08:26 2019 +0200

    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 at redhat.com>
    (cherry picked from commit 81f06a142d3228a97341d0728d2aff761b5fd5a2)
    Reviewed-on: https://gerrit.libreoffice.org/81264
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

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