slirp: remove qemu timer.h dependency

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff --git a/slirp/if.c b/slirp/if.c
index 73e3705740f166d881008a8e067e77d6fcfda52e..90b9078687f4e177650cf749b0afcd6cd7fb4033 100644 (file)
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -7,7 +7,6 @@
 
 #include "qemu/osdep.h"
 #include "slirp.h"
-#include "qemu/timer.h"
 
 static void
 ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)

diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c
index e72c57a81dc08acd086823825c0fdeee5d9c63ef..682597e6762adf753f3555eb6fd57f281ef9513a 100644 (file)
--- a/slirp/ip6_icmp.c
+++ b/slirp/ip6_icmp.c
@@ -6,7 +6,6 @@
 #include "qemu/osdep.h"
 #include "slirp.h"
 #include "ip6_icmp.h"
-#include "qemu/timer.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
 

diff --git a/slirp/slirp.c b/slirp/slirp.c
index b5c4788489df4f7023f82cc22c3ededd8e2729ac..7a5d97c77f1efed1b9cbed6208c11d61feafecbd 100644 (file)
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -23,7 +23,6 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "qemu/timer.h"
 #include "qemu/error-report.h"
 #include "migration/register.h"
 #include "slirp.h"

diff --git a/slirp/util.h b/slirp/util.h
index 586517bb3059cab56f88f9dd890422659f255cc1..922077435e99a584ee911cca1990df595993f4c5 100644 (file)
--- a/slirp/util.h
+++ b/slirp/util.h
@@ -48,6 +48,8 @@
 # define SLIRP_PACKED __attribute__((packed))
 #endif
 
+#define SCALE_MS 1000000
+
 #ifdef _WIN32
 int slirp_closesocket(int fd);
 int slirp_ioctlsocket(int fd, int req, void *val);