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>

diff --git a/libcacard/cac.c b/libcacard/cac.c
index f38fdcedddc21d540d77c4339496f9348ee38b4f..bc84534f9caaff764a4dce9a4e0531a0bf4d1524 100644 (file)
--- 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 814fa1662ffa571219f6b09b4cd140d6d5f708be..22fd334d157952eb8f0e36a1969a21ba7b37a809 100644 (file)
--- 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 4c551e4e388164d94e5e9d7d30ca58c1886a46ce..63f4057fe55bbc1c11d0d21b1a37f324c654a0f3 100644 (file)
--- 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 d140a8ed1a58f901490db21fe0dbefab970e7516..1a87208f3de6fe72496b3a750d40aa63d3b3f519 100644 (file)
--- 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 950edee069a6a8a97ea697f3318f1ceeebc8e7b2..6955f690b3a405a6e250a6ead64505d90571ba01 100644 (file)
--- 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 0315dd89201cfe775ca5f1bf9e0acf947b1cdd50..9725f46a743e8f70bd15d6fcc0f9896a795b68f2 100644 (file)
--- 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 fa6041de99bd577387a54b614603dd67172403dc..06526844372f60933839a45dea434249860723c0 100644 (file)
--- 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"