diff options
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/debug.c | 2 | ||||
| -rw-r--r-- | slirp/mbuf.c | 6 | ||||
| -rw-r--r-- | slirp/misc.h | 2 | ||||
| -rw-r--r-- | slirp/slirp_config.h | 8 | ||||
| -rw-r--r-- | slirp/socket.c | 1 |
5 files changed, 8 insertions, 11 deletions
diff --git a/slirp/debug.c b/slirp/debug.c index 7c8581d631..bfef580694 100644 --- a/slirp/debug.c +++ b/slirp/debug.c @@ -16,8 +16,6 @@ int dostats = 0; #endif int slirp_debug = 0; -extern char *strerror _P((int)); - /* Carry over one item from main.c so that the tty's restored. * Only done when the tty being used is /dev/tty --RedWolf */ #ifndef CONFIG_QEMU diff --git a/slirp/mbuf.c b/slirp/mbuf.c index 5d12554285..c8797e61f4 100644 --- a/slirp/mbuf.c +++ b/slirp/mbuf.c @@ -28,7 +28,7 @@ int mbuf_max = 0; * Find a nice value for msize * XXX if_maxlinkhdr already in mtu */ -#define MSIZE (IF_MTU + IF_MAXLINKHDR + sizeof(struct m_hdr ) + 6) +#define SLIRP_MSIZE (IF_MTU + IF_MAXLINKHDR + sizeof(struct m_hdr ) + 6) void m_init() @@ -54,7 +54,7 @@ m_get() DEBUG_CALL("m_get"); if (m_freelist.m_next == &m_freelist) { - m = (struct mbuf *)malloc(MSIZE); + m = (struct mbuf *)malloc(SLIRP_MSIZE); if (m == NULL) goto end_error; mbuf_alloced++; if (mbuf_alloced > MBUF_THRESH) @@ -71,7 +71,7 @@ m_get() m->m_flags = (flags | M_USEDLIST); /* Initialise it */ - m->m_size = MSIZE - sizeof(struct m_hdr); + m->m_size = SLIRP_MSIZE - sizeof(struct m_hdr); m->m_data = m->m_dat; m->m_len = 0; m->m_nextpkt = 0; diff --git a/slirp/misc.h b/slirp/misc.h index e405e38dc0..f6a4cb090e 100644 --- a/slirp/misc.h +++ b/slirp/misc.h @@ -17,7 +17,7 @@ struct ex_list { }; extern struct ex_list *exec_list; -extern u_int curtime, time_fasttimo, last_slowtimo; +extern u_int time_fasttimo, last_slowtimo; extern int (*lprint_print) _P((void *, const char *, va_list)); extern char *lprint_ptr, *lprint_ptr2, **lprint_arg; diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h index e7e95dd5a0..dbc8dfd428 100644 --- a/slirp/slirp_config.h +++ b/slirp/slirp_config.h @@ -128,10 +128,10 @@ #undef HAVE_SYS_STROPTS_H /* Define to whatever your compiler thinks inline should be */ -#define inline inline +//#define inline inline /* Define to whatever your compiler thinks const should be */ -#define const const +//#define const const /* Define if your compiler doesn't like prototypes */ #undef NO_PROTOTYPES @@ -170,7 +170,7 @@ #undef HAVE_SETENV /* Define if you have index() */ -#undef HAVE_INDEX +#define HAVE_INDEX /* Define if you have bcmp() */ #undef HAVE_BCMP @@ -182,7 +182,7 @@ #define HAVE_MEMMOVE /* Define if you have gethostid */ -#undef HAVE_GETHOSTID +#define HAVE_GETHOSTID /* Define if you DON'T have unix-domain sockets */ #undef NO_UNIX_SOCKETS diff --git a/slirp/socket.c b/slirp/socket.c index 75003af153..462240924f 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -8,7 +8,6 @@ #define WANT_SYS_IOCTL_H #include <slirp.h> #include "ip_icmp.h" -#include "main.h" #ifdef __sun__ #include <sys/filio.h> #endif |