| Message ID | 4e8dcc24123a09587ecc427f2e80727ba41a7866.1521868380.git.mprivozn@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi On Sat, Mar 24, 2018 at 6:13 AM, Michal Privoznik <mprivozn@redhat.com> wrote: > 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" > The warning was promptly removed in 2.5.2: https://cgit.freedesktop.org/spice/libcacard/commit/?id=998db1e88eb8219264476c022d1446f3cb4330e8 > Signed-off-by: Michal Privoznik <mprivozn@redhat.com> > --- > hw/usb/ccid-card-emulated.c | 5 +---- > hw/usb/ccid-card-passthru.c | 2 +- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c > index ea42e4681d..7b538ae6da 100644 > --- a/hw/usb/ccid-card-emulated.c > +++ b/hw/usb/ccid-card-emulated.c > @@ -27,10 +27,7 @@ > */ > > #include "qemu/osdep.h" > -#include <eventt.h> > -#include <vevent.h> > -#include <vreader.h> > -#include <vcard_emul.h> > +#include <cacard/libcacard.h> > > #include "qemu/thread.h" > #include "qemu/main-loop.h" > diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c > index b7dd3602dc..982d575edd 100644 > --- a/hw/usb/ccid-card-passthru.c > +++ b/hw/usb/ccid-card-passthru.c > @@ -9,7 +9,7 @@ > */ > > #include "qemu/osdep.h" > -#include <cacard/vscard_common.h> > +#include <cacard/libcacard.h> > #include "chardev/char-fe.h" > #include "qemu/error-report.h" > #include "qemu/sockets.h" > -- > 2.16.1 > >
On 03/24/2018 12:01 PM, Marc-André Lureau wrote: > Hi > > On Sat, Mar 24, 2018 at 6:13 AM, Michal Privoznik <mprivozn@redhat.com> wrote: >> 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" >> > > The warning was promptly removed in 2.5.2: > https://cgit.freedesktop.org/spice/libcacard/commit/?id=998db1e88eb8219264476c022d1446f3cb4330e8 Cool. But We can still include just top level header file instead of individual files, can't we? Michal
Hi On Sat, Mar 24, 2018 at 1:40 PM, Michal Privoznik <mprivozn@redhat.com> wrote: > On 03/24/2018 12:01 PM, Marc-André Lureau wrote: >> Hi >> >> On Sat, Mar 24, 2018 at 6:13 AM, Michal Privoznik <mprivozn@redhat.com> wrote: >>> 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" >>> >> >> The warning was promptly removed in 2.5.2: >> https://cgit.freedesktop.org/spice/libcacard/commit/?id=998db1e88eb8219264476c022d1446f3cb4330e8 > > Cool. But We can still include just top level header file instead of > individual files, can't we? Yes, if we bump libcacard version dependency. 2.5.1 (that added top-level libcacard.h) is from 2015-11-24.
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index ea42e4681d..7b538ae6da 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -27,10 +27,7 @@ */ #include "qemu/osdep.h" -#include <eventt.h> -#include <vevent.h> -#include <vreader.h> -#include <vcard_emul.h> +#include <cacard/libcacard.h> #include "qemu/thread.h" #include "qemu/main-loop.h" diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index b7dd3602dc..982d575edd 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include <cacard/vscard_common.h> +#include <cacard/libcacard.h> #include "chardev/char-fe.h" #include "qemu/error-report.h" #include "qemu/sockets.h"
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" Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- hw/usb/ccid-card-emulated.c | 5 +---- hw/usb/ccid-card-passthru.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-)