Message ID | 20181218230442.27887-28-samuel.thibault@ens-lyon.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43KDkb1QK7z9s3Z for <incoming@patchwork.ozlabs.org>; Wed, 19 Dec 2018 10:29:27 +1100 (AEDT) Received: from localhost ([::1]:56771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gZOnk-0002J6-Oc for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2018 18:29:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <samuel.thibault@ens-lyon.org>) id 1gZOR5-0000Gg-5F for qemu-devel@nongnu.org; Tue, 18 Dec 2018 18:05:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <samuel.thibault@ens-lyon.org>) id 1gZOR3-0004wN-0K for qemu-devel@nongnu.org; Tue, 18 Dec 2018 18:05:58 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]:57626) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <samuel.thibault@ens-lyon.org>) id 1gZOR0-0004Jt-ST for qemu-devel@nongnu.org; Tue, 18 Dec 2018 18:05:55 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 0AAEF279B; Wed, 19 Dec 2018 00:05:09 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2O_f7B09gBfM; Wed, 19 Dec 2018 00:05:08 +0100 (CET) Received: from function.home (unknown [IPv6:2a01:cb19:181:c200:9eb6:d0ff:fe88:c3c7]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 2089328BF; Wed, 19 Dec 2018 00:04:45 +0100 (CET) Received: from samy by function.home with local (Exim 4.91) (envelope-from <samuel.thibault@ens-lyon.org>) id 1gZOPr-0007Ib-Fg; Wed, 19 Dec 2018 00:04:43 +0100 From: Samuel Thibault <samuel.thibault@ens-lyon.org> To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Wed, 19 Dec 2018 00:04:05 +0100 Message-Id: <20181218230442.27887-28-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181218230442.27887-1-samuel.thibault@ens-lyon.org> References: <20181218230442.27887-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a0c:e300::1 Subject: [Qemu-devel] [PULL 27/64] slirp: remove HAVE_SYS_FILIO_H X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>, Samuel Thibault <samuel.thibault@ens-lyon.org>, stefanha@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/64] slirp: associate slirp_output callback with the Slirp context
|
expand
|
diff --git a/slirp/slirp.h b/slirp/slirp.h index 226bced429..4bbbba046e 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -36,7 +36,7 @@ typedef char *caddr_t; # include <sys/ioctl.h> #endif -#ifdef HAVE_SYS_FILIO_H +#ifdef __APPLE__ # include <sys/filio.h> #endif diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h index 0e78e92d94..f1ee927c15 100644 --- a/slirp/slirp_config.h +++ b/slirp/slirp_config.h @@ -11,12 +11,6 @@ * You shouldn't need to touch any of these */ -/* Define if you have sys/filio.h */ -#undef HAVE_SYS_FILIO_H -#ifdef __APPLE__ -#define HAVE_SYS_FILIO_H -#endif - /* Define if the machine is big endian */ //#undef HOST_WORDS_BIGENDIAN