Merge remote-tracking branch 'kraxel/seabios-a810e4e' into staging

[qemu.git] / slirp / misc.h

diff --git a/slirp/misc.h b/slirp/misc.h
index 2f478885de23fa15480c1b376ac2802e7a43d734..cc36aeb9592ccee8bb203e369e7bddf551e2bf51 100644 (file)
--- a/slirp/misc.h
+++ b/slirp/misc.h
@@ -16,13 +16,11 @@ struct ex_list {
        struct ex_list *ex_next;
 };
 
-extern struct ex_list *exec_list;
-
 #ifndef HAVE_STRDUP
-char *strdup _P((const char *));
+char *strdup(const char *);
 #endif
 
-void do_wait _P((int));
+void do_wait(int);
 
 #define EMU_NONE 0x0
 
@@ -38,42 +36,36 @@ void do_wait _P((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 _P((char *, struct socket *));
-void redir_x _P((u_int32_t, int, int, int));
-void slirp_insque _P((void *, void *));
-void slirp_remque _P((void *));
-int add_exec _P((struct ex_list **, int, char *, struct in_addr, int));
-int slirp_openpty _P((int *, int *));
+int show_x(char *, struct socket *);
+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);
+int slirp_openpty(int *, int *);
 int fork_exec(struct socket *so, const char *ex, int do_pty);
-void snooze_hup _P((int));
-void snooze _P((void));
-void relay _P((int));
-void add_emu _P((char *));
-void u_sleep _P((int));
-void fd_nonblock _P((int));
-void fd_block _P((int));
-int rsh_exec _P((struct socket *, struct socket *, char *, char *, char *));
+void snooze_hup(int);
+void snooze(void);
+void relay(int);
+void add_emu(char *);
+void fd_nonblock(int);
+void fd_block(int);
+int rsh_exec(struct socket *, struct socket *, char *, char *, char *);
 
 #endif