From patchwork Mon May 27 20:51:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 246658 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 535392C02C3 for ; Tue, 28 May 2013 06:52:25 +1000 (EST) Received: from localhost ([::1]:41004 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uh4P1-0006Mq-EY for incoming@patchwork.ozlabs.org; Mon, 27 May 2013 16:52:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uh4Oh-0006Lp-Mb for qemu-devel@nongnu.org; Mon, 27 May 2013 16:52:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uh4Og-0003J0-1G for qemu-devel@nongnu.org; Mon, 27 May 2013 16:52:03 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:48145) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uh4Of-0003Iw-QC; Mon, 27 May 2013 16:52:01 -0400 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 5348041D10; Tue, 28 May 2013 00:52:00 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 71C0047A; Tue, 28 May 2013 00:51:59 +0400 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Date: Tue, 28 May 2013 00:51:51 +0400 Message-Id: <1369687911-9731-1-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Jan Kiszka , Michael Tokarev Subject: [Qemu-devel] [PATCH trivial] slirp: cleanup leftovers from misc.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There are quite a few leftover declarations in slirp/misc.h. Remove them. Signed-off-by: Michael Tokarev --- slirp/misc.h | 14 -------------- 1 file changed, 14 deletions(-) I'm not entirely sure we should do this, since this kind of changes just moves us more and more away from the upstream, but... diff --git a/slirp/misc.h b/slirp/misc.h index cc36aeb..ba8beb1 100644 --- a/slirp/misc.h +++ b/slirp/misc.h @@ -20,8 +20,6 @@ struct ex_list { char *strdup(const char *); #endif -void do_wait(int); - #define EMU_NONE 0x0 /* TCP emulations */ @@ -51,21 +49,9 @@ struct emu_t { struct emu_t *next; }; -extern int x_port, x_server, x_display; - -int show_x(char *, struct socket *); -void redir_x(uint32_t, int, int, int); void slirp_insque(void *, void *); void slirp_remque(void *); int add_exec(struct ex_list **, int, char *, struct in_addr, int); -int slirp_openpty(int *, int *); int fork_exec(struct socket *so, const char *ex, int do_pty); -void snooze_hup(int); -void snooze(void); -void relay(int); -void add_emu(char *); -void fd_nonblock(int); -void fd_block(int); -int rsh_exec(struct socket *, struct socket *, char *, char *, char *); #endif