From patchwork Tue Sep 28 21:48:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 66028 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B9B33B7120 for ; Wed, 29 Sep 2010 07:51:31 +1000 (EST) Received: from localhost ([127.0.0.1]:42611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P0i5A-0006B0-Ct for incoming@patchwork.ozlabs.org; Tue, 28 Sep 2010 17:51:28 -0400 Received: from [140.186.70.92] (port=36652 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P0i3p-0005i0-5p for qemu-devel@nongnu.org; Tue, 28 Sep 2010 17:50:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1P0i3n-00058A-U5 for qemu-devel@nongnu.org; Tue, 28 Sep 2010 17:50:05 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:36449) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P0i3n-00057p-MA for qemu-devel@nongnu.org; Tue, 28 Sep 2010 17:50:03 -0400 Received: from smtp08.web.de ( [172.20.5.216]) by fmmailgate03.web.de (Postfix) with ESMTP id 8E2231629464B; Tue, 28 Sep 2010 23:50:01 +0200 (CEST) Received: from [87.173.125.30] (helo=localhost.localdomain) by smtp08.web.de with asmtp (WEB.DE 4.110 #24) id 1P0i3l-0006vW-00; Tue, 28 Sep 2010 23:50:01 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Tue, 28 Sep 2010 23:48:42 +0200 Message-Id: <1285710522-6061-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.3 MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1/7Z+JIh9nkiiR50aGgXGtssJoTbCKg0l/mE0uG 1HfXGK2VsvcEd3TW5/SNGdpdKNZQK6Ft+9d2q4nwdtWeoRtesO QR48f1vt0SNePWr3MpYA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH] tap: Remove double include of util.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If neither of __FreeBSD__, __FreeBSD_kernel__ and __DragonFly__ is defined, util.h is included from tap-bsd.c. Don't include it again if __OpenBSD__ is defined. Cc: Blue Swirl Signed-off-by: Andreas Färber --- net/tap-bsd.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 959939e..0c0ca5b 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -37,10 +37,6 @@ #include #endif -#if defined(__OpenBSD__) -#include -#endif - int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required) { int fd;