From 1768b04b53062a5e89f6b9d341f7780b4d4dfc9d Mon Sep 17 00:00:00 2001
From: Harri Porten <porten@kde.org>
Date: Sun, 6 May 2007 14:38:28 +0000
Subject: [PATCH] compile without Xfixes extension

svn path=/trunk/KDE/kdebase/workspace/; revision=661762
---
 composite.cpp     | 2 +-
 effects.cpp       | 2 +-
 scene_xrender.cpp | 2 +-
 scene_xrender.h   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composite.cpp b/composite.cpp
index 473b0d442c..3f9881b5a6 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -73,7 +73,7 @@ void Workspace::setupCompositing()
             scene = new SceneBasic( this );
             kDebug( 1212 ) << "X compositing" << endl;
           break;
-#ifdef HAVE_XRENDER
+#if defined(HAVE_XRENDER) && defined(HAVE_XFIXES)
         case 'X':
             scene = new SceneXrender( this );
             kDebug( 1212 ) << "XRender compositing" << endl;
diff --git a/effects.cpp b/effects.cpp
index 208bed7c20..37df4dafe8 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -552,7 +552,7 @@ void EffectsHandlerImpl::reserveElectricBorderSwitching( bool reserve )
 
 unsigned long EffectsHandlerImpl::xrenderBufferPicture()
     {
-#ifdef HAVE_XRENDER
+#if defined(HAVE_XRENDER) && defined(HAVE_XFIXES)
     if( SceneXrender* s = dynamic_cast< SceneXrender* >( scene ))
         return s->bufferPicture();
 #endif
diff --git a/scene_xrender.cpp b/scene_xrender.cpp
index abaae3b4fd..1b5d268b25 100644
--- a/scene_xrender.cpp
+++ b/scene_xrender.cpp
@@ -29,7 +29,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "scene_xrender.h"
 
-#ifdef HAVE_XRENDER
+#if defined(HAVE_XRENDER) && defined(HAVE_XFIXES)
 
 #include "toplevel.h"
 #include "client.h"
diff --git a/scene_xrender.h b/scene_xrender.h
index 099ab488b7..3f9343eb9a 100644
--- a/scene_xrender.h
+++ b/scene_xrender.h
@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "scene.h"
 
-#ifdef HAVE_XRENDER
+#if defined(HAVE_XRENDER) && defined(HAVE_XFIXES)
 #include <X11/extensions/Xrender.h>
 
 namespace KWin