qemu-iotests: make cancel_and_wait() common

[qemu.git] / slirp / slirp.h

diff --git a/slirp/slirp.h b/slirp/slirp.h
index 0107b07e660b9c4fa42bbdc086e4d63f3bef1398..fe0e65d0eee0bd1442caf2a8df3a67a8d6fd28b3 100644 (file)
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -133,8 +133,8 @@ void free(void *ptr);
 
 #include "debug.h"
 
-#include "qemu-queue.h"
-#include "qemu_socket.h"
+#include "qemu/queue.h"
+#include "qemu/sockets.h"
 
 #include "libslirp.h"
 #include "ip.h"
@@ -215,7 +215,6 @@ struct Slirp {
     char client_hostname[33];
 
     int restricted;
-    struct timeval tt;
     struct ex_list *exec_list;
 
     /* mbuf states */