diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-03-02 15:51:12 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-03-08 19:45:27 +0100 |
| commit | f7a77f9881d5cd1d360b043d6b619216603941dd (patch) | |
| tree | f51302aa48c9a0cda58d72dd4e575ae9eeadb102 /common/gl_canvas.c | |
| parent | c0fdcd1a10d0eae92fec9e00382b445d669c7428 (diff) | |
| download | spice-f7a77f9881d5cd1d360b043d6b619216603941dd.tar.gz spice-f7a77f9881d5cd1d360b043d6b619216603941dd.tar.xz spice-f7a77f9881d5cd1d360b043d6b619216603941dd.zip | |
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.
Diffstat (limited to 'common/gl_canvas.c')
| -rw-r--r-- | common/gl_canvas.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/common/gl_canvas.c b/common/gl_canvas.c index 6b5eda97..f173194e 100644 --- a/common/gl_canvas.c +++ b/common/gl_canvas.c @@ -811,9 +811,7 @@ GLCanvas *gl_canvas_create(void *usr_data, int width, int height, int depth, #else GLCanvas *gl_canvas_create(void *usr_data, int width, int height, int depth #endif -#ifdef USE_GLZ , SpiceGlzDecoder *glz_decoder -#endif #ifndef CAIRO_CANVAS_NO_CHUNKS , void *get_virt_opaque, get_virt_fn_t get_virt, void *validate_virt_opaque, validate_virt_fn_t validate_virt @@ -843,10 +841,7 @@ GLCanvas *gl_canvas_create(void *usr_data, int width, int height, int depth #else init_ok = canvas_base_init(&canvas->base, depth #endif -#ifdef USE_GLZ - , - glz_decoder -#endif + , glz_decoder #ifndef CAIRO_CANVAS_NO_CHUNKS , get_virt_opaque, |