diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2015-11-30 22:52:36 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2015-12-08 14:11:49 +0100 |
| commit | e0c2182937c7d8c53bc265bf420403d91c349496 (patch) | |
| tree | 4024fd4675c9bc945d469f3da7b73586f3e0eead | |
| parent | 92288aa9ac260dc24a78da533b6020d87ef260df (diff) | |
| download | spice-gtk-e0c2182937c7d8c53bc265bf420403d91c349496.tar.gz spice-gtk-e0c2182937c7d8c53bc265bf420403d91c349496.tar.xz spice-gtk-e0c2182937c7d8c53bc265bf420403d91c349496.zip | |
Use libcacard.h if possible
Drop unneeded includes (that are already undirectly included).
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
| -rw-r--r-- | src/channel-smartcard.c | 4 | ||||
| -rw-r--r-- | src/smartcard-manager.c | 6 | ||||
| -rw-r--r-- | 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 - #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 67873ed..38ef159 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" |