From 5912af45f071330da684ea357635695999afed88 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Tue, 2 Mar 2010 15:51:12 +0100
Subject: Make glz_decoder non-optional canvas_base in canvas constructors

It can still be NULL, but we simplify the headers by always including it.
There is no practical performance difference here.
---
 common/gdi_canvas.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'common/gdi_canvas.c')

diff --git a/common/gdi_canvas.c b/common/gdi_canvas.c
index c4750a8..40305df 100644
--- a/common/gdi_canvas.c
+++ b/common/gdi_canvas.c
@@ -1707,9 +1707,7 @@ GdiCanvas *gdi_canvas_create(HDC dc, int bits,
 #else
 GdiCanvas *gdi_canvas_create(HDC dc, int bits
 #endif
-#ifdef USE_GLZ
                             , SpiceGlzDecoder *glz_decoder
-#endif
                             )
 {
     GdiCanvas *canvas;
@@ -1729,11 +1727,7 @@ GdiCanvas *gdi_canvas_create(HDC dc, int bits
 #else
     init_ok = gdi_canvas_base_init(&canvas->base, bits
 #endif
-#ifdef USE_GLZ
-                               ,
-                               glz_decoder
-#endif
-                               );
+                               , glz_decoder);
     canvas->dc = dc;
     canvas->lock = lock;
     return canvas;
-- 
cgit