On Wed, Dec 02, 2015 at 02:57:16PM -0600, Jonathon Jongsma wrote: > > diff --git a/server/spice_bitmap_utils.h b/server/spice_bitmap_utils.h > > deleted file mode 100644 > > index 69860e5..0000000 > > --- a/server/spice_bitmap_utils.h > > +++ /dev/null > > @@ -1,8 +0,0 @@ > > -#ifndef H_SPICE_BITMAP_UTILS > > -#define H_SPICE_BITMAP_UTILS > > - > > -void dump_bitmap(SpiceBitmap *bitmap); > > - > > -int spice_bitmap_from_surface_type(uint32_t surface_format); > > - > > -#endif > > diff --git a/server/sw-canvas.c b/server/sw-canvas.c > > index 0ef050e..cba44ea 100644 > > --- a/server/sw-canvas.c > > +++ b/server/sw-canvas.c > > @@ -1,3 +1,4 @@ > > +/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */ > > /* > > Copyright (C) 2011 Red Hat, Inc. > > > > @@ -17,10 +18,10 @@ > > #ifdef HAVE_CONFIG_H > > #include <config.h> > > #endif > > - > > -#include "common/spice_common.h" > > - > > #include "sw-canvas.h" > > + > > +#define SPICE_CANVAS_INTERNAL > > #define SW_CANVAS_IMAGE_CACHE > > #include "common/sw_canvas.c" > > #undef SW_CANVAS_IMAGE_CACHE > > +#undef SPICE_CANVAS_INTERNAL > > I don't understand this change. As far as I can tell, the SPICE_CANVAS_INTERNAL > symbol is never used anywhere... I'd just drop it. Commit 69f3f86ff7936 dropped it from git master in May 2014, could be just some rebase hiccup. Christophe
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel