aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-04-27 12:34:18 +0200
committerMichael Tokarev <mjt@tls.msk.ru>2015-04-30 16:05:48 +0300
commit28507a415a9b1e897aa8cdab658c6cdc00eff6cd (patch)
treed1a0ed15180b09178418c8720b2e412d71bb1ef2
parentd3e4abdddfcf70b2e678de1c6b9b1c6cd3ce541e (diff)
libcacard: stop including qemu-common.h
This is a small step towards making libcacard standalone. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--libcacard/cac.c5
-rw-r--r--libcacard/card_7816.c4
-rw-r--r--libcacard/event.c2
-rw-r--r--libcacard/vcard.c4
-rw-r--r--libcacard/vcard_emul_nss.c2
-rw-r--r--libcacard/vreader.c4
-rw-r--r--libcacard/vscclient.c8
7 files changed, 22 insertions, 7 deletions
diff --git a/libcacard/cac.c b/libcacard/cac.c
index f38fdceddd..bc84534f9c 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 814fa1662f..22fd334d15 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 4c551e4e38..63f4057fe5 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 d140a8ed1a..1a87208f3d 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 950edee069..6955f690b3 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 0315dd8920..9725f46a74 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 fa6041de99..0652684437 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"