Re: [Qemu-devel] [PATCH v2] libcacard: stop including qemu-common.h
06.05.2015 12:23, Laurent Desnogues wrote: Hello, On Mon, Apr 27, 2015 at 3:27 PM, Michael Tokarev m...@tls.msk.ru wrote: From: Paolo Bonzini pbonz...@redhat.com This is a small step towards making libcacard standalone. on my system the removal of qemu-common.h inclusion broke compilation due to assert being used in glib-compat.h. Interesting. What kind of build environment is that? I compile-tested on several platforms, all went fine.. ;) A fix might be to include assert.h in glib-compat.h. I prefer s/assert/g_assert/ in glib-compat.h. Thanks, /mjt
Re: [Qemu-devel] [PATCH v2] libcacard: stop including qemu-common.h
Hello, On Mon, Apr 27, 2015 at 3:27 PM, Michael Tokarev m...@tls.msk.ru wrote: From: Paolo Bonzini pbonz...@redhat.com This is a small step towards making libcacard standalone. on my system the removal of qemu-common.h inclusion broke compilation due to assert being used in glib-compat.h. A fix might be to include assert.h in glib-compat.h. Thanks, Laurent Signed-off-by: Paolo Bonzini pbonz...@redhat.com Signed-off-by: Michael Tokarev m...@tls.msk.ru --- v2: update vscclient.c too, use unistd.h on !WIN32 and getopt.h on *nix libcacard/cac.c| 5 - libcacard/card_7816.c | 4 +++- libcacard/event.c | 2 +- libcacard/vcard.c | 4 +++- libcacard/vcard_emul_nss.c | 2 +- libcacard/vreader.c| 4 +++- libcacard/vscclient.c | 8 +++- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/libcacard/cac.c b/libcacard/cac.c index f38fdce..bc84534 100644 --- a/libcacard/cac.c +++ b/libcacard/cac.c @@ -5,7 +5,10 @@ * See the COPYING.LIB file in the top-level directory. */ -#include qemu-common.h +#include glib-compat.h + +#include string.h +#include stdbool.h #include cac.h #include vcard.h diff --git a/libcacard/card_7816.c b/libcacard/card_7816.c index 814fa16..22fd334 100644 --- a/libcacard/card_7816.c +++ b/libcacard/card_7816.c @@ -5,7 +5,9 @@ * See the COPYING.LIB file in the top-level directory. */ -#include qemu-common.h +#include glib-compat.h + +#include string.h #include vcard.h #include vcard_emul.h diff --git a/libcacard/event.c b/libcacard/event.c index 4c551e4..63f4057 100644 --- a/libcacard/event.c +++ b/libcacard/event.c @@ -5,7 +5,7 @@ * See the COPYING.LIB file in the top-level directory. */ -#include qemu-common.h +#include glib-compat.h #include vcard.h #include vreader.h diff --git a/libcacard/vcard.c b/libcacard/vcard.c index d140a8e..1a87208 100644 --- a/libcacard/vcard.c +++ b/libcacard/vcard.c @@ -5,7 +5,9 @@ * See the COPYING.LIB file in the top-level directory. */ -#include qemu-common.h +#include glib-compat.h + +#include string.h #include vcard.h #include vcard_emul.h diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c index 950edee..6955f69 100644 --- a/libcacard/vcard_emul_nss.c +++ b/libcacard/vcard_emul_nss.c @@ -25,7 +25,7 @@ #include prthread.h #include secerr.h -#include qemu-common.h +#include glib-compat.h #include vcard.h #include card_7816t.h diff --git a/libcacard/vreader.c b/libcacard/vreader.c index 0315dd8..9725f46 100644 --- a/libcacard/vreader.c +++ b/libcacard/vreader.c @@ -10,7 +10,9 @@ #endif #define G_LOG_DOMAIN libcacard -#include qemu-common.h +#include glib-compat.h + +#include string.h #include vcard.h #include vcard_emul.h diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c index fa6041d..0652684 100644 --- a/libcacard/vscclient.c +++ b/libcacard/vscclient.c @@ -10,14 +10,20 @@ * See the COPYING.LIB file in the top-level directory. */ +#include stdio.h +#include stdlib.h +#include string.h #ifndef _WIN32 #include sys/socket.h #include netinet/in.h #include netdb.h +#include unistd.h #define closesocket(x) close(x) +#else +#include getopt.h #endif -#include qemu-common.h +#include glib-compat.h #include vscard_common.h -- 2.1.4
Re: [Qemu-devel] [PATCH v2] libcacard: stop including qemu-common.h
On Wed, May 6, 2015 at 12:05 PM, Michael Tokarev m...@tls.msk.ru wrote: 06.05.2015 12:23, Laurent Desnogues wrote: Hello, On Mon, Apr 27, 2015 at 3:27 PM, Michael Tokarev m...@tls.msk.ru wrote: From: Paolo Bonzini pbonz...@redhat.com This is a small step towards making libcacard standalone. on my system the removal of qemu-common.h inclusion broke compilation due to assert being used in glib-compat.h. Interesting. What kind of build environment is that? I compile-tested on several platforms, all went fine.. ;) That's a CentOS 6.6 machine with glib2 2.28.8. A fix might be to include assert.h in glib-compat.h. I prefer s/assert/g_assert/ in glib-compat.h. That indeed looks better :-) Thanks, Laurent Thanks, /mjt
[Qemu-devel] [PATCH v2] libcacard: stop including qemu-common.h
From: Paolo Bonzini pbonz...@redhat.com This is a small step towards making libcacard standalone. Signed-off-by: Paolo Bonzini pbonz...@redhat.com Signed-off-by: Michael Tokarev m...@tls.msk.ru --- v2: update vscclient.c too, use unistd.h on !WIN32 and getopt.h on *nix libcacard/cac.c| 5 - libcacard/card_7816.c | 4 +++- libcacard/event.c | 2 +- libcacard/vcard.c | 4 +++- libcacard/vcard_emul_nss.c | 2 +- libcacard/vreader.c| 4 +++- libcacard/vscclient.c | 8 +++- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/libcacard/cac.c b/libcacard/cac.c index f38fdce..bc84534 100644 --- a/libcacard/cac.c +++ b/libcacard/cac.c @@ -5,7 +5,10 @@ * See the COPYING.LIB file in the top-level directory. */ -#include qemu-common.h +#include glib-compat.h + +#include string.h +#include stdbool.h #include cac.h #include vcard.h diff --git a/libcacard/card_7816.c b/libcacard/card_7816.c index 814fa16..22fd334 100644 --- a/libcacard/card_7816.c +++ b/libcacard/card_7816.c @@ -5,7 +5,9 @@ * See the COPYING.LIB file in the top-level directory. */ -#include qemu-common.h +#include glib-compat.h + +#include string.h #include vcard.h #include vcard_emul.h diff --git a/libcacard/event.c b/libcacard/event.c index 4c551e4..63f4057 100644 --- a/libcacard/event.c +++ b/libcacard/event.c @@ -5,7 +5,7 @@ * See the COPYING.LIB file in the top-level directory. */ -#include qemu-common.h +#include glib-compat.h #include vcard.h #include vreader.h diff --git a/libcacard/vcard.c b/libcacard/vcard.c index d140a8e..1a87208 100644 --- a/libcacard/vcard.c +++ b/libcacard/vcard.c @@ -5,7 +5,9 @@ * See the COPYING.LIB file in the top-level directory. */ -#include qemu-common.h +#include glib-compat.h + +#include string.h #include vcard.h #include vcard_emul.h diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c index 950edee..6955f69 100644 --- a/libcacard/vcard_emul_nss.c +++ b/libcacard/vcard_emul_nss.c @@ -25,7 +25,7 @@ #include prthread.h #include secerr.h -#include qemu-common.h +#include glib-compat.h #include vcard.h #include card_7816t.h diff --git a/libcacard/vreader.c b/libcacard/vreader.c index 0315dd8..9725f46 100644 --- a/libcacard/vreader.c +++ b/libcacard/vreader.c @@ -10,7 +10,9 @@ #endif #define G_LOG_DOMAIN libcacard -#include qemu-common.h +#include glib-compat.h + +#include string.h #include vcard.h #include vcard_emul.h diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c index fa6041d..0652684 100644 --- a/libcacard/vscclient.c +++ b/libcacard/vscclient.c @@ -10,14 +10,20 @@ * See the COPYING.LIB file in the top-level directory. */ +#include stdio.h +#include stdlib.h +#include string.h #ifndef _WIN32 #include sys/socket.h #include netinet/in.h #include netdb.h +#include unistd.h #define closesocket(x) close(x) +#else +#include getopt.h #endif -#include qemu-common.h +#include glib-compat.h #include vscard_common.h -- 2.1.4
Re: [Qemu-devel] [PATCH v2] libcacard: stop including qemu-common.h
On 27/04/2015 15:27, Michael Tokarev wrote: From: Paolo Bonzini pbonz...@redhat.com This is a small step towards making libcacard standalone. Signed-off-by: Paolo Bonzini pbonz...@redhat.com Signed-off-by: Michael Tokarev m...@tls.msk.ru --- v2: update vscclient.c too, use unistd.h on !WIN32 and getopt.h on *nix Thanks very much Michael. The vscclient.c parts look good, you may want to add your changes before your S-o-b line. Paolo libcacard/cac.c| 5 - libcacard/card_7816.c | 4 +++- libcacard/event.c | 2 +- libcacard/vcard.c | 4 +++- libcacard/vcard_emul_nss.c | 2 +- libcacard/vreader.c| 4 +++- libcacard/vscclient.c | 8 +++- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/libcacard/cac.c b/libcacard/cac.c index f38fdce..bc84534 100644 --- a/libcacard/cac.c +++ b/libcacard/cac.c @@ -5,7 +5,10 @@ * See the COPYING.LIB file in the top-level directory. */ -#include qemu-common.h +#include glib-compat.h + +#include string.h +#include stdbool.h #include cac.h #include vcard.h diff --git a/libcacard/card_7816.c b/libcacard/card_7816.c index 814fa16..22fd334 100644 --- a/libcacard/card_7816.c +++ b/libcacard/card_7816.c @@ -5,7 +5,9 @@ * See the COPYING.LIB file in the top-level directory. */ -#include qemu-common.h +#include glib-compat.h + +#include string.h #include vcard.h #include vcard_emul.h diff --git a/libcacard/event.c b/libcacard/event.c index 4c551e4..63f4057 100644 --- a/libcacard/event.c +++ b/libcacard/event.c @@ -5,7 +5,7 @@ * See the COPYING.LIB file in the top-level directory. */ -#include qemu-common.h +#include glib-compat.h #include vcard.h #include vreader.h diff --git a/libcacard/vcard.c b/libcacard/vcard.c index d140a8e..1a87208 100644 --- a/libcacard/vcard.c +++ b/libcacard/vcard.c @@ -5,7 +5,9 @@ * See the COPYING.LIB file in the top-level directory. */ -#include qemu-common.h +#include glib-compat.h + +#include string.h #include vcard.h #include vcard_emul.h diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c index 950edee..6955f69 100644 --- a/libcacard/vcard_emul_nss.c +++ b/libcacard/vcard_emul_nss.c @@ -25,7 +25,7 @@ #include prthread.h #include secerr.h -#include qemu-common.h +#include glib-compat.h #include vcard.h #include card_7816t.h diff --git a/libcacard/vreader.c b/libcacard/vreader.c index 0315dd8..9725f46 100644 --- a/libcacard/vreader.c +++ b/libcacard/vreader.c @@ -10,7 +10,9 @@ #endif #define G_LOG_DOMAIN libcacard -#include qemu-common.h +#include glib-compat.h + +#include string.h #include vcard.h #include vcard_emul.h diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c index fa6041d..0652684 100644 --- a/libcacard/vscclient.c +++ b/libcacard/vscclient.c @@ -10,14 +10,20 @@ * See the COPYING.LIB file in the top-level directory. */ +#include stdio.h +#include stdlib.h +#include string.h #ifndef _WIN32 #include sys/socket.h #include netinet/in.h #include netdb.h +#include unistd.h #define closesocket(x) close(x) +#else +#include getopt.h #endif -#include qemu-common.h +#include glib-compat.h #include vscard_common.h
