From d2ee99e15f773306647696d45d69bfc5e358cd29 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Fri, 23 Jan 2015 17:17:09 +0100
Subject: Remove another redundant (SW_CANVAS_CACHE) || (SW_CANVAS_IMAGE_CACHE)
 #ifdef

---
 common/canvas_base.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/canvas_base.c b/common/canvas_base.c
index a2dc431..400fba4 100644
--- a/common/canvas_base.c
+++ b/common/canvas_base.c
@@ -1575,12 +1575,10 @@ static pixman_image_t *canvas_get_mask(CanvasBase *canvas, SpiceQMask *mask, int
         surface = canvas_get_bitmap_mask(canvas, &image->u.bitmap, is_invers);
         break;
     }
-#if defined(SW_CANVAS_CACHE) || defined(SW_CANVAS_IMAGE_CACHE)
     case SPICE_IMAGE_TYPE_FROM_CACHE:
         surface = canvas->bits_cache->ops->get(canvas->bits_cache, image->descriptor.id);
         is_invers = 0;
         break;
-#endif
 #ifdef SW_CANVAS_CACHE
     case SPICE_IMAGE_TYPE_FROM_CACHE_LOSSLESS:
         surface = canvas->bits_cache->ops->get_lossless(canvas->bits_cache, image->descriptor.id);
-- 
cgit