Re: [PATCH libcacard] Remove libcacard.h warning

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi

----- Original Message -----
> Hey,
> 
> On Thu, Dec 03, 2015 at 03:35:34PM +0100, Marc-André Lureau wrote:
> > qemu.git uses -Werror by default, and this is problematic as 2.5.0
> 
> QEMU 2.5.0 I guess? The similar versioning between QEMU and libcacard
> can be confused, better to be explicit when you mention "QEMU"
> 
> > doesn't use libcacard.h and it breaks some developpers setup.
> > 
> > Remove the warning and release 2.5.2.
> > 
> > This change can be reverted in a near future (after 2.5.0 release and
> > a qemu patch is merged?)
> 
> I guess merging a patch in QEMU to use libcacard.h before the QEMU 2.5.0
> release is not an option?
> 
> ACK.

it's a tad late, we are a week away from the release.

Note that it's only to satisfy qemu developpers building from git with the latest libcacard (or those using Werror)

> 
> Christophe
> 
> > 
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxx>
> > ---
> >  NEWS                  | 5 +++++
> >  src/cac.h             | 4 ----
> >  src/capcsc.h          | 4 ----
> >  src/card_7816.h       | 4 ----
> >  src/card_7816t.h      | 4 ----
> >  src/eventt.h          | 4 ----
> >  src/vcard.h           | 4 ----
> >  src/vcard_emul.h      | 4 ----
> >  src/vcard_emul_type.h | 4 ----
> >  src/vcardt.h          | 4 ----
> >  src/vevent.h          | 4 ----
> >  src/vreader.h         | 4 ----
> >  src/vreadert.h        | 4 ----
> >  src/vscard_common.h   | 4 ----
> >  14 files changed, 5 insertions(+), 52 deletions(-)
> > 
> > diff --git a/NEWS b/NEWS
> > index e995ed4..7ab2eb6 100644
> > --- a/NEWS
> > +++ b/NEWS
> > @@ -1,3 +1,8 @@
> > +v2.5.2
> > +======
> > +
> > +- remove libcacard.h usage warning (to silence qemu 2.5.0 build)
> > +
> >  v2.5.1
> >  ======
> >  
> > diff --git a/src/cac.h b/src/cac.h
> > index 26b4379..af7f4cd 100644
> > --- a/src/cac.h
> > +++ b/src/cac.h
> > @@ -8,10 +8,6 @@
> >  #ifndef CAC_H
> >  #define CAC_H 1
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  #include "vcard.h"
> >  #include "vreader.h"
> >  
> > diff --git a/src/capcsc.h b/src/capcsc.h
> > index 4696499..bb59a4e 100644
> > --- a/src/capcsc.h
> > +++ b/src/capcsc.h
> > @@ -5,10 +5,6 @@
> >  #ifndef CAPCSC_H
> >  #define CAPCSC_H 1
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  #define CAPCSC_POLL_TIME            50      /* ms  - Time we will poll for
> >  */
> >                                              /*       card change when a
> >                                              */
> >                                              /*       reader is connected
> >                                              */
> > diff --git a/src/card_7816.h b/src/card_7816.h
> > index 90588b9..30b6d09 100644
> > --- a/src/card_7816.h
> > +++ b/src/card_7816.h
> > @@ -7,10 +7,6 @@
> >  #ifndef CARD_7816_H
> >  #define CARD_7816_H  1
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  #include "card_7816t.h"
> >  #include "vcardt.h"
> >  
> > diff --git a/src/card_7816t.h b/src/card_7816t.h
> > index 14c1fae..8e78444 100644
> > --- a/src/card_7816t.h
> > +++ b/src/card_7816t.h
> > @@ -7,10 +7,6 @@
> >  #ifndef CARD_7816T_H
> >  #define CARD_7816T_H 1
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  typedef unsigned short vcard_7816_status_t;
> >  
> >  struct VCardResponseStruct {
> > diff --git a/src/eventt.h b/src/eventt.h
> > index d676591..f94a22a 100644
> > --- a/src/eventt.h
> > +++ b/src/eventt.h
> > @@ -6,10 +6,6 @@
> >  #ifndef EVENTT_H
> >  #define EVENTT_H 1
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  #include "vreadert.h"
> >  #include "vcardt.h"
> >  
> > diff --git a/src/vcard.h b/src/vcard.h
> > index 9bc722c..1364dfb 100644
> > --- a/src/vcard.h
> > +++ b/src/vcard.h
> > @@ -5,10 +5,6 @@
> >  #ifndef VCARD_H
> >  #define VCARD_H 1
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  #include "vcardt.h"
> >  
> >  /*
> > diff --git a/src/vcard_emul.h b/src/vcard_emul.h
> > index 9dd7b3b..a552efb 100644
> > --- a/src/vcard_emul.h
> > +++ b/src/vcard_emul.h
> > @@ -13,10 +13,6 @@
> >  #ifndef VCARD_EMUL_H
> >  #define VCARD_EMUL_H 1
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  #include "card_7816t.h"
> >  #include "vcard.h"
> >  #include "vcard_emul_type.h"
> > diff --git a/src/vcard_emul_type.h b/src/vcard_emul_type.h
> > index 46e0782..61ea479 100644
> > --- a/src/vcard_emul_type.h
> > +++ b/src/vcard_emul_type.h
> > @@ -11,10 +11,6 @@
> >  #ifndef VCARD_EMUL_TYPE_H
> >  #define VCARD_EMUL_TYPE_H 1
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  #include "vcardt.h"
> >  #include "vreadert.h"
> >  
> > diff --git a/src/vcardt.h b/src/vcardt.h
> > index db82b4b..0589d13 100644
> > --- a/src/vcardt.h
> > +++ b/src/vcardt.h
> > @@ -5,10 +5,6 @@
> >  #ifndef VCARDT_H
> >  #define VCARDT_H 1
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  /*
> >   * these should come from some common spice header file
> >   */
> > diff --git a/src/vevent.h b/src/vevent.h
> > index 640ea41..33335b8 100644
> > --- a/src/vevent.h
> > +++ b/src/vevent.h
> > @@ -5,10 +5,6 @@
> >  #ifndef EVENT_H
> >  #define EVENT_H 1
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  #include "eventt.h"
> >  #include "vreadert.h"
> >  #include "vcardt.h"
> > diff --git a/src/vreader.h b/src/vreader.h
> > index 4aa75ed..dd9414a 100644
> > --- a/src/vreader.h
> > +++ b/src/vreader.h
> > @@ -6,10 +6,6 @@
> >  #ifndef VREADER_H
> >  #define VREADER_H 1
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  #include "eventt.h"
> >  #include "vreadert.h"
> >  #include "vcardt.h"
> > diff --git a/src/vreadert.h b/src/vreadert.h
> > index 085ac70..53078e0 100644
> > --- a/src/vreadert.h
> > +++ b/src/vreadert.h
> > @@ -6,10 +6,6 @@
> >  #ifndef VREADERT_H
> >  #define VREADERT_H 1
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  typedef enum {
> >      VREADER_OK = 0,
> >      VREADER_NO_CARD,
> > diff --git a/src/vscard_common.h b/src/vscard_common.h
> > index 50079ec..f2a18e1 100644
> > --- a/src/vscard_common.h
> > +++ b/src/vscard_common.h
> > @@ -22,10 +22,6 @@
> >  #ifndef VSCARD_COMMON_H
> >  #define VSCARD_COMMON_H
> >  
> > -#if !defined(__LIBCACARD_H_INSIDE__) && !defined(LIBCACARD_COMPILATION)
> > -#warning "Only <libcacard.h> can be included directly"
> > -#endif
> > -
> >  #include <stdint.h>
> >  #include <glib.h>
> >  
> > --
> > 2.5.0
> > 
> > _______________________________________________
> > Spice-devel mailing list
> > Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> > http://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
> 
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]     [Monitors]