include/prex.h | 4 ++++
vcl/source/gdi/gdimtf.cxx | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit c36ff98f796761a4ec106563ad9761d8020b497a
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue May 28 16:08:38 2013 +0300
Error out if <prex.h> is included when compiling for OS X
The X11 headers are present in the OS X SDK (because OS X does have an X11
server, even though I think it might be a separate download and install on
demand nowadays), but we don't want to include them even if it would be
harmless.
Change-Id: I48011d7e1d2cd6398fc7b4cba8ec8100addc053b
diff --git a/include/prex.h b/include/prex.h
index e513880..a37433d 100644
--- a/include/prex.h
+++ b/include/prex.h
@@ -20,6 +20,10 @@
#ifndef _PREX_H
#define _PREX_H
+#ifdef MACOSX
+#error No X headers should be included for MACOSX even if they are present in
the SDK
+#endif
+
/* Types from <X11/X.h> that clash with LO's identifiers
* and we don't need.
*/
commit 13229ce11e8d801e4dd40060fd801830095aa59e
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue May 28 16:06:30 2013 +0300
UNX does not imply X11
We really need some feature test macro that would be equivalent to
using X11.
Change-Id: I0c1f9b487b4feab3b7d4641e898f9fdf0144065b
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 7ca07e1..ffee748 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -47,7 +47,7 @@
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/graphic/XGraphicRenderer.hpp>
-#ifdef UNX
+#if defined(UNX) && !defined(ANDROID) && !defined(IOS) && !defined(MACOSX) &&
!defined(LIBO_HEADLESS)
#include <unx/salbmp.h>
#endif
@@ -450,7 +450,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut,
const Point& rPos, S
// and the commit that changed to the new code relied on alpha
support in bitmap
// (which that commit implemented only in X11SalBitmap) and so
it didn't work on Windows.
// So keep both.
-#ifdef UNX
+#if defined(UNX) && !defined(ANDROID) && !defined(IOS) && !defined(MACOSX) &&
!defined(LIBO_HEADLESS)
X11SalBitmap* X11Bmp = static_cast< X11SalBitmap* >( pSalBmp );
X11Bmp->SetHasAlpha( true );
if( X11Bmp->Create( xBitmapCanvas, aSize ) )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
