diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2011-05-13 13:25:05 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2011-06-23 20:05:33 +0200 |
| commit | f36bc5e2575d235d231f0d1df17c8f2791ed8f8d (patch) | |
| tree | 67167da1e521f84f1b666a1a3cfc48210cb01696 /common | |
| parent | 13a8be965aa1c2843421b296c591b2c06c8dc28b (diff) | |
| download | spice-gtk-f36bc5e2575d235d231f0d1df17c8f2791ed8f8d.tar.gz spice-gtk-f36bc5e2575d235d231f0d1df17c8f2791ed8f8d.tar.xz spice-gtk-f36bc5e2575d235d231f0d1df17c8f2791ed8f8d.zip | |
fix compilation when libcacard isn't installed
Diffstat (limited to 'common')
| -rw-r--r-- | common/marshallers.h | 6 | ||||
| -rw-r--r-- | common/messages.h | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/common/marshallers.h b/common/marshallers.h index b30773a..c192d5b 100644 --- a/common/marshallers.h +++ b/common/marshallers.h @@ -19,6 +19,10 @@ #ifndef _H_MARSHALLERS #define _H_MARSHALLERS +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <spice/protocol.h> #include <marshaller.h> #include <messages.h> @@ -55,11 +59,13 @@ typedef struct { void (*msgc_tunnel_socket_closed_ack)(SpiceMarshaller *m, SpiceMsgcTunnelSocketClosedAck *msg); void (*msgc_tunnel_socket_data)(SpiceMarshaller *m, SpiceMsgcTunnelSocketData *msg); void (*msgc_tunnel_socket_token)(SpiceMarshaller *m, SpiceMsgcTunnelSocketTokens *msg); +#ifdef USE_SMARTCARD void (*msgc_smartcard_atr)(SpiceMarshaller *m, VSCMsgATR *msg); void (*msgc_smartcard_error)(SpiceMarshaller *m, VSCMsgError *msg); void (*msgc_smartcard_header)(SpiceMarshaller *m, VSCMsgHeader *msg); void (*msgc_smartcard_msg)(SpiceMarshaller *m, SpiceMsgcSmartcard *msg, SpiceMarshaller **reader_name_out); void (*msgc_smartcard_reader_add)(SpiceMarshaller *m, VSCMsgReaderAdd *msg); +#endif } SpiceMessageMarshallers; SpiceMessageMarshallers *spice_message_marshallers_get(void); diff --git a/common/messages.h b/common/messages.h index e70f4c6..556496b 100644 --- a/common/messages.h +++ b/common/messages.h @@ -31,8 +31,14 @@ #ifndef _H_MESSAGES #define _H_MESSAGES +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <spice/protocol.h> +#ifdef USE_SMARTCARD #include <vscard_common.h> +#endif #include "draw.h" #ifdef __cplusplus @@ -508,6 +514,7 @@ typedef struct SpiceMsgcTunnelSocketTokens { uint32_t num_tokens; } SpiceMsgcTunnelSocketTokens; +#ifdef USE_SMARTCARD typedef struct SpiceMsgSmartcard { VSCMsgType type; uint32_t length; @@ -523,6 +530,7 @@ typedef struct SpiceMsgcSmartcard { VSCMsgReaderAdd add; }; } SpiceMsgcSmartcard; +#endif #ifdef __cplusplus } |