From patchwork Fri May 13 07:04:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 9088291 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EB907BF29F for ; Fri, 13 May 2016 07:05:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5DCF02017D for ; Fri, 13 May 2016 07:05:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A17902017E for ; Fri, 13 May 2016 07:05:04 +0000 (UTC) Received: from localhost ([::1]:32976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b179j-0008SU-Nd for patchwork-qemu-devel@patchwork.kernel.org; Fri, 13 May 2016 03:05:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b179T-0008Jt-Dm for qemu-devel@nongnu.org; Fri, 13 May 2016 03:04:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b179N-0003PO-5b for qemu-devel@nongnu.org; Fri, 13 May 2016 03:04:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38482) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b179N-0003PK-02; Fri, 13 May 2016 03:04:41 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 88C757F6B4; Fri, 13 May 2016 07:04:40 +0000 (UTC) Received: from thh440s.fritz.box (vpn1-7-225.ams2.redhat.com [10.36.7.225]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4D74XkZ010464; Fri, 13 May 2016 03:04:39 -0400 From: Thomas Huth To: Samuel Thibault , qemu-devel@nongnu.org Date: Fri, 13 May 2016 09:04:31 +0200 Message-Id: <1463123072-30603-4-git-send-email-thuth@redhat.com> In-Reply-To: <1463123072-30603-1-git-send-email-thuth@redhat.com> References: <1463123072-30603-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 13 May 2016 07:04:40 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/4] slirp: Remove some unused code from slirp.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Jan Kiszka Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These hunks are apparently not used anymore, so let's delete them. Signed-off-by: Thomas Huth --- 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))