block-migration: remove useless calls to blk_mig_cleanup

[qemu.git] / slirp / misc.h

diff --git a/slirp/misc.h b/slirp/misc.h
index c33539435685fe595e5dd33fb8e2f97c66c5179b..cc36aeb9592ccee8bb203e369e7bddf551e2bf51 100644 (file)
--- a/slirp/misc.h
+++ b/slirp/misc.h
@@ -36,30 +36,25 @@ void do_wait(int);
 
 #define EMU_NOCONNECT 0x10     /* Don't connect */
 
-/* UDP emulations */
-#define EMU_TALK       0x1
-#define EMU_NTALK      0x2
-#define EMU_CUSEEME    0x3
-
 struct tos_t {
-       u_int16_t lport;
-       u_int16_t fport;
-       u_int8_t tos;
-       u_int8_t emu;
+    uint16_t lport;
+    uint16_t fport;
+    uint8_t tos;
+    uint8_t emu;
 };
 
 struct emu_t {
-       u_int16_t lport;
-       u_int16_t fport;
-       u_int8_t tos;
-       u_int8_t emu;
-       struct emu_t *next;
+    uint16_t lport;
+    uint16_t fport;
+    uint8_t tos;
+    uint8_t emu;
+    struct emu_t *next;
 };
 
 extern int x_port, x_server, x_display;
 
 int show_x(char *, struct socket *);
-void redir_x(u_int32_t, int, int, int);
+void redir_x(uint32_t, int, int, int);
 void slirp_insque(void *, void *);
 void slirp_remque(void *);
 int add_exec(struct ex_list **, int, char *, struct in_addr, int);
@@ -69,7 +64,6 @@ void snooze_hup(int);
 void snooze(void);
 void relay(int);
 void add_emu(char *);
-void u_sleep(int);
 void fd_nonblock(int);
 void fd_block(int);
 int rsh_exec(struct socket *, struct socket *, char *, char *, char *);