From patchwork Tue Feb 23 14:18:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 8392421 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C47559FC33 for ; Tue, 23 Feb 2016 14:18:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D6A020306 for ; Tue, 23 Feb 2016 14:18:48 +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 7BBF920103 for ; Tue, 23 Feb 2016 14:18:46 +0000 (UTC) Received: from localhost ([::1]:57432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYDnZ-0002uQ-Rf for patchwork-qemu-devel@patchwork.kernel.org; Tue, 23 Feb 2016 09:18:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYDnS-0002te-Ql for qemu-devel@nongnu.org; Tue, 23 Feb 2016 09:18:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYDnR-0008Pd-WE for qemu-devel@nongnu.org; Tue, 23 Feb 2016 09:18:38 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:55916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYDnR-0008PQ-Pr for qemu-devel@nongnu.org; Tue, 23 Feb 2016 09:18:37 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84) (envelope-from ) id 1aYDnP-0001pS-Ns; Tue, 23 Feb 2016 14:18:35 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 23 Feb 2016 14:18:29 +0000 Message-Id: <1456237112-32662-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456237112-32662-1-git-send-email-peter.maydell@linaro.org> References: <1456237112-32662-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Cc: patches@linaro.org Subject: [Qemu-devel] [PATCH 1/4] slirp/slirp.h: Remove now-empty #ifdefs 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org 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 After automatic cleanup to remove unnecessary #includes of headers that osdep.h provides, slirp.h has a few now unnecessary #ifdef/#endif pairs; remove them. Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth --- slirp/slirp.h | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/slirp/slirp.h b/slirp/slirp.h index 07c13b4..7cfcf63 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -26,28 +26,10 @@ typedef char *caddr_t; #endif -#ifdef HAVE_UNISTD_H -#endif - -#ifdef HAVE_STDLIB_H -#endif - - #ifndef HAVE_MEMMOVE #define memmove(x, y, z) bcopy(y, x, z) #endif -#if TIME_WITH_SYS_TIME -#else -# ifdef HAVE_SYS_TIME_H -# else -# endif -#endif - -#ifdef HAVE_STRING_H -#else -#endif - #ifndef _WIN32 #include #endif @@ -98,12 +80,6 @@ void free(void *ptr); #include #endif -#ifdef __STDC__ -#else -#include -#endif - - /* Avoid conflicting with the libc insque() and remque(), which have different prototypes. */ #define insque slirp_insque