diff options
| author | Tor Lillqvist <tml@iki.fi> | 2018-08-27 17:34:56 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2018-08-27 22:29:49 +0300 |
| commit | 71527a308a4b32284830911a055087d05d078a71 (patch) | |
| tree | 3ace5b89951b0a6fcc6b5c677cbdf43b88254703 /vcl/inc | |
| parent | 823a328a04167935be38203ae05181ec5eb9b386 (diff) | |
Fix iOS build after f05f4e042ca6ac8ae7f1d1e8e6bfb4cbba17a044
Change-Id: I7b0c737b84f4528a8fba01e2998f525046834b1c
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/headless/svpgdi.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/ios/iosinst.hxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 58761d0fcb1a..8877b2ebf201 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -24,7 +24,6 @@ #include <vcl/sysdata.hxx> #include <vcl/metric.hxx> #include <config_cairo_canvas.h> -#include <cairo.h> #include <salgdi.hxx> #include <sallayout.hxx> @@ -35,6 +34,8 @@ #define SvpSalGraphics AquaSalGraphics #else +#include <cairo.h> + //Using formats that match cairo's formats. For android we patch cairo, //which is internal in that case, to swap the rgb components so that //cairo then matches the OpenGL GL_RGBA format so we can use it there diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx index 262ef1063076..478ea5c47859 100644 --- a/vcl/inc/ios/iosinst.hxx +++ b/vcl/inc/ios/iosinst.hxx @@ -33,7 +33,7 @@ class IosSalFrame; class IosSalInstance : public SvpSalInstance { public: - IosSalInstance( SalYieldMutex *pMutex ); + IosSalInstance( std::unique_ptr<SalYieldMutex> pMutex ); virtual ~IosSalInstance(); static IosSalInstance *getInstance(); |