OSDN Git Service

ccid-card: include libcacard.h only
authorMichal Privoznik <mprivozn@redhat.com>
Tue, 3 Apr 2018 10:34:37 +0000 (12:34 +0200)
committerGerd Hoffmann <kraxel@redhat.com>
Fri, 27 Apr 2018 08:57:09 +0000 (10:57 +0200)
commit0f5c642d49c3a843bd8b8790d7014fd84bcf6405
tree3ee4d3db1f481f13f49cbba4ab2fba871b4a32b9
parent9d8fa0df49af16a208fa961c2968fba4daffcc07
ccid-card: include libcacard.h only

When trying to build with latest libcacard-2.5.1, I hit the
following error:

In file included from hw/usb/ccid-card-passthru.c:12:0:
/usr/include/cacard/vscard_common.h:26:2: error: #warning "Only <libcacard.h> can be included directly" [-Werror=cpp]
 #warning "Only <libcacard.h> can be included directly"

While it was fixed in libcacard upstream (so that individual
files can be included directly), it doesn't make much sense.
Let's switch to including the main libcacard.h and also require
at least libcacard-2.5.1 which introduced it. It's available
since late 2015.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 3c36db1dc0702763ebb7966cc27428ed67d43804.1522751624.git.mprivozn@redhat.com

[ kraxel: fix include path ]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
configure
hw/usb/ccid-card-emulated.c
hw/usb/ccid-card-passthru.c