merge

2 files changed, 8 insertions, 10 deletions

diff --git a/vcl/unx/source/gdi/xrender_peer.cxx b/vcl/unx/source/gdi/xrender_peer.cxx
index fc8de818fafd..4af202a1ca65 100644
--- a/vcl/unx/source/gdi/xrender_peer.cxx
+++ b/vcl/unx/source/gdi/xrender_peer.cxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -28,6 +25,9 @@
  *
  ************************************************************************/
 
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_vcl.hxx"
+
 #include <stdio.h>
 #include <rtl/ustring.hxx>
 #include <osl/module.h>
@@ -175,7 +175,7 @@ void XRenderPeer::InitRenderLib()
 #if 0 // not having trapezoid support is supported
     if( !pFunc ) return;
 #endif
-    mpXRenderAddTraps = (void(*)(Display*,Picture,int,int,const XTrap*,int))pFunc;
+    mpXRenderAddTraps = (void(*)(Display*,Picture,int,int,const _XTrap*,int))pFunc;
 
 #endif // XRENDER_LINK
 
diff --git a/vcl/unx/source/gdi/xrender_peer.hxx b/vcl/unx/source/gdi/xrender_peer.hxx
index 27c8fb3dcaeb..cc9d121ee21f 100644
--- a/vcl/unx/source/gdi/xrender_peer.hxx
+++ b/vcl/unx/source/gdi/xrender_peer.hxx
@@ -6,9 +6,6 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,6 +29,7 @@
 #define _SV_XRENDER_PEER_HXX
 
 #include <tools/prex.h>
+struct _XTrap; // on some older systems this is not declared within Xrender.h
 #include <X11/extensions/Xrender.h>
 #include <tools/postx.h>
 
@@ -87,7 +85,7 @@ public:
                     const XRenderPictFormat*, int nXSrc, int nYSrc,
                     const XTrapezoid*, int nCount ) const;
     bool        AddTraps( Picture aDst, int nXOfs, int nYOfs,
-                    const XTrap*, int nCount ) const;
+                    const _XTrap*, int nCount ) const;
 
     bool        AreTrapezoidsSupported() const
 #ifdef XRENDER_LINK
@@ -123,7 +121,7 @@ private:
                     const XRenderColor*,int,int,unsigned int,unsigned int);
     void        (*mpXRenderCompositeTrapezoids)(Display*,int,Picture,Picture,
                     const XRenderPictFormat*,int,int,const XTrapezoid*,int);
-    void        (*mpXRenderAddTraps)(Display*,Picture,int,int,const XTrap*,int);
+    void        (*mpXRenderAddTraps)(Display*,Picture,int,int,const _XTrap*,int);
 #endif // XRENDER_LINK
 };
 
@@ -329,7 +327,7 @@ inline void XRenderPeer::CompositeTrapezoids( int nOp,
 }
 
 inline bool XRenderPeer::AddTraps( Picture aDst, int nXOfs, int nYOfs,
-    const XTrap* pTraps, int nCount ) const
+    const _XTrap* pTraps, int nCount ) const
 {
 #ifdef XRENDER_LINK
     XRenderAddTraps( mpDisplay, aDst, nXOfs, nYOfs, pTraps, nCount );