From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2O8w-00077O-L5 for qemu-devel@nongnu.org; Mon, 16 May 2016 15:25:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2O8r-0004Nw-7z for qemu-devel@nongnu.org; Mon, 16 May 2016 15:25:29 -0400 Received: from hera.aquilenet.fr ([141.255.128.1]:54439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2O8r-0004Mb-0s for qemu-devel@nongnu.org; Mon, 16 May 2016 15:25:25 -0400 From: Samuel Thibault Date: Mon, 16 May 2016 21:25:19 +0200 Message-Id: <1463426720-25008-4-git-send-email-samuel.thibault@ens-lyon.org> In-Reply-To: <1463426720-25008-1-git-send-email-samuel.thibault@ens-lyon.org> References: <1463426720-25008-1-git-send-email-samuel.thibault@ens-lyon.org> Subject: [Qemu-devel] [PULL 3/4] slirp: Remove some unused code from slirp.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: Thomas Huth , jan.kiszka@siemens.com, Samuel Thibault From: Thomas Huth These hunks are apparently not used anymore, so let's delete them. Signed-off-by: Thomas Huth Reviewed-by: Peter Maydell Signed-off-by: Samuel Thibault --- slirp/slirp.h | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/slirp/slirp.h b/slirp/slirp.h index 5b5df59..e373876 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -58,10 +58,6 @@ typedef char *caddr_t; # include #endif -#ifdef USE_PPP -#include -#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 #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)) -- 2.8.1