Commit 0f5c642d authored Apr 03, 2018 by Michal Privoznik Committed by Gerd Hoffmann Apr 27, 2018

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>

parent 9d8fa0df

configure

+1 −1

Original line number	Diff line number	Diff line
		@@ -4449,7 +4449,7 @@ fi

		# check for smartcard support
		if test "$smartcard" != "no"; then
		if $pkg_config libcacard; then
		if $pkg_config --atleast-version=2.5.1 libcacard; then
		libcacard_cflags=$($pkg_config --cflags libcacard)
		libcacard_libs=$($pkg_config --libs libcacard)
		smartcard="yes"

hw/usb/ccid-card-emulated.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -27,10 +27,7 @@
		*/

		#include "qemu/osdep.h"
		#include <eventt.h>
		#include <vevent.h>
		#include <vreader.h>
		#include <vcard_emul.h>
		#include <libcacard.h>

		#include "qemu/thread.h"
		#include "qemu/main-loop.h"

hw/usb/ccid-card-passthru.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		*/

		#include "qemu/osdep.h"
		#include <cacard/vscard_common.h>
		#include <libcacard.h>
		#include "chardev/char-fe.h"
		#include "qemu/error-report.h"
		#include "qemu/sockets.h"