Commit 2cdc848e authored by Thomas Huth's avatar Thomas Huth Committed by Samuel Thibault
Browse files

slirp: Remove some unused code from slirp.h 



These hunks are apparently not used anymore, so let's delete them.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
parent 5469fead

slirp/slirp.h

+0 −22
Original line number Diff line number Diff line
@@ -58,10 +58,6 @@ typedef char *caddr_t; 
# include <sys/filio.h>

#endif



#ifdef USE_PPP

#include <ppp/slirppp.h>

#endif



/* Avoid conflicting with the libc insque() and remque(), which

   have different prototypes. */

#define insque slirp_insque
@@ -96,10 +92,6 @@ typedef char *caddr_t; 
#include "if.h"

#include "main.h"

#include "misc.h"

#ifdef USE_PPP

#include "ppp/pppd.h"

#include "ppp/ppp.h"

#endif



#include "bootp.h"

#include "tftp.h"
@@ -237,18 +229,12 @@ extern Slirp *slirp_instance; 
#define NULL (void *)0

#endif



#ifndef FULL_BOLT

void if_start(Slirp *);

#else

void if_start(struct ttys *);

#endif



#ifndef _WIN32

#include <netdb.h>

#endif



#define DEFAULT_BAUD 115200



#define SO_OPTIONS DO_KEEPALIVE

#define TCP_MAXIDLE (TCPTV_KEEPCNT * TCPTV_KEEPINTVL)
@@ -306,14 +292,6 @@ int tcp_emu(struct socket *, struct mbuf *); 
int tcp_ctl(struct socket *);

struct tcpcb *tcp_drop(struct tcpcb *tp, int err);



#ifdef USE_PPP

#define MIN_MRU MINMRU

#define MAX_MRU MAXMRU

#else

#define MIN_MRU 128

#define MAX_MRU 16384

#endif



#ifndef _WIN32

#define min(x,y) ((x) < (y) ? (x) : (y))

#define max(x,y) ((x) > (y) ? (x) : (y))