WaE: error: 'CAIRO_VERSION' is not defined

Desktop / LibreOffice - Caolán McNamara [redhat.com] - 25 June 2015 09:29 UTC



###

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index f5dbaf4..d29a956 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -141,7 +141,7 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long nWidth, long nHeight,
#if !ENABLE_CAIRO_CANVAS
(void)nX; (void)nY; (void)nWidth; (void)nHeight; (void)nTransparency;
return false;
-#elif CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
+#elif defined(CAIRO_VERSION) && defined(CAIRO_VERSION_ENCODE) && CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
if (m_bUseLineColor || !m_bUseFillColor)
return false;

b51fe01 WaE: error: 'CAIRO_VERSION' is not defined
vcl/headless/svpgdi.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Upstream: cgit.freedesktop.org

  • Share