[Libreoffice-commits] core.git: vcl/inc

[Stephan Bergmann (via logerrit)]

 vcl/inc/skia/gdiimpl.hxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 44be127235a9cb37361f21c832678daf5efe926d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Dec 5 09:28:36 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Dec 5 11:06:09 2019 +0100

    Make sure external/skia include file doesn't define macro Yield
    
    Caused build breaker on Windows at least with clang-cl and --disable-pch:
    
    > In file included from C:/lo-clang/core/vcl/skia/gdiimpl.cxx:25:
    > C:/lo-clang/core/include\vcl/svapp.hxx(487,5): error: declaration does not declare anything [-Werror,-Wmissing-declarations]
    >     static void                 Yield();
    >     ^~~~~~~~~~~
    
    Change-Id: Ibadd59c99040c318c874d0eb6747006bfb5e248f
    Reviewed-on: https://gerrit.libreoffice.org/84505
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx
index 517bad0db5c8..98edc9156384 100644
--- a/vcl/inc/skia/gdiimpl.hxx
+++ b/vcl/inc/skia/gdiimpl.hxx
@@ -26,7 +26,10 @@
 #include <salgeom.hxx>
 
 #include <SkSurface.h>
+
+#include <prewin.h>
 #include <tools/sk_app/VulkanWindowContext.h>
+#include <postwin.h>
 
 class SkiaFlushIdle;