aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2016-05-13 09:04:31 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-05-16 21:00:31 +0200
commit2cdc848eb5bd7caf467942aee63f813f52db4e40 (patch)
tree94806283c9ef9b5fb1c8f345dbda62086ebbbe13
parent5469feadb1dafc663ed5b978dc9a5ff0b1b69a6e (diff)
downloadqemu-arm-2cdc848eb5bd7caf467942aee63f813f52db4e40.tar.gz
slirp: Remove some unused code from slirp.h
These hunks are apparently not used anymore, so let's delete them. Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
-rw-r--r--slirp/slirp.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 5b5df59762..e37387605b 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -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))