Hi, On Mon, Nov 30, 2015 at 11:06:05PM +0100, Marc-André Lureau wrote: > Drop unneeded includes (that are already undirectly included). > > Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxx> > --- > src/channel-smartcard.c | 4 ---- > src/smartcard-manager.c | 6 +++++- > src/spicy.c | 5 ----- > 3 files changed, 5 insertions(+), 10 deletions(-) > > diff --git a/src/channel-smartcard.c b/src/channel-smartcard.c > index 942f973..7403431 100644 > --- a/src/channel-smartcard.c > +++ b/src/channel-smartcard.c > @@ -17,10 +17,6 @@ > */ > #include "config.h" > > -#ifdef USE_SMARTCARD > -#include <vreader.h> > -#endif This seems to break the build with libcacard 2.5.0 ? Not sure why, the m4 checks looks good. I've upgraded to 2.5.2 and it builds normally. cheers, toso > - > #include "spice-client.h" > #include "spice-common.h" > > diff --git a/src/smartcard-manager.c b/src/smartcard-manager.c > index 8e0d239..6578328 100644 > --- a/src/smartcard-manager.c > +++ b/src/smartcard-manager.c > @@ -22,10 +22,14 @@ > > #include "glib-compat.h" > > -#ifdef USE_SMARTCARD > +#ifdef USE_SMARTCARD_012 > #include <vcard_emul.h> > #include <vevent.h> > #include <vreader.h> > +#else > +#ifdef USE_SMARTCARD > +#include <libcacard.h> > +#endif > #endif > > #include "spice-client.h" > diff --git a/src/spicy.c b/src/spicy.c > index 2b5cef8..74b3475 100644 > --- a/src/spicy.c > +++ b/src/spicy.c > @@ -24,11 +24,6 @@ > #include <termios.h> > #endif > > -#ifdef USE_SMARTCARD > -#include <vreader.h> > -#include "smartcard-manager.h" > -#endif > - > #include "glib-compat.h" > #include "spice-widget.h" > #include "spice-gtk-session.h" > -- > 2.5.0 > > _______________________________________________ > Spice-devel mailing list > Spice-devel@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/spice-devel _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel