david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slirp: Remove some unused code from slirp.h

Browse Source 
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>
This commit is contained in:
Thomas Huth 2016-05-13 09:04:31 +02:00 committed by Samuel Thibault
parent 5469feadb1
commit 2cdc848eb5
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
slirp/slirp.h
View File

@ -58,10 +58,6 @@ typedef char *caddr_t;
# include <sys/filio.h> # include <sys/filio.h>
#endif #endif
#ifdef USE_PPP
#include <ppp/slirppp.h>
#endif
/* Avoid conflicting with the libc insque() and remque(), which /* Avoid conflicting with the libc insque() and remque(), which
have different prototypes. */ have different prototypes. */
#define insque slirp_insque #define insque slirp_insque
@ -96,10 +92,6 @@ typedef char *caddr_t;
#include "if.h" #include "if.h"
#include "main.h" #include "main.h"
#include "misc.h" #include "misc.h"
#ifdef USE_PPP
#include "ppp/pppd.h"
#include "ppp/ppp.h"
#endif
#include "bootp.h" #include "bootp.h"
#include "tftp.h" #include "tftp.h"
@ -237,18 +229,12 @@ extern Slirp *slirp_instance;
#define NULL (void *)0 #define NULL (void *)0
#endif #endif
#ifndef FULL_BOLT
void if_start(Slirp *); void if_start(Slirp *);
#else
void if_start(struct ttys *);
#endif
#ifndef _WIN32 #ifndef _WIN32
#include <netdb.h> #include <netdb.h>
#endif #endif
#define DEFAULT_BAUD 115200
#define SO_OPTIONS DO_KEEPALIVE #define SO_OPTIONS DO_KEEPALIVE
#define TCP_MAXIDLE (TCPTV_KEEPCNT * TCPTV_KEEPINTVL) #define TCP_MAXIDLE (TCPTV_KEEPCNT * TCPTV_KEEPINTVL)
@ -306,14 +292,6 @@ int tcp_emu(struct socket *, struct mbuf *);
int tcp_ctl(struct socket *); int tcp_ctl(struct socket *);
struct tcpcb *tcp_drop(struct tcpcb *tp, int err); 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 #ifndef _WIN32
#define min(x,y) ((x) < (y) ? (x) : (y)) #define min(x,y) ((x) < (y) ? (x) : (y))
#define max(x,y) ((x) > (y) ? (x) : (y)) #define max(x,y) ((x) > (y) ? (x) : (y))