From patchwork Tue May 24 15:24:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 9133849 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8116E607D5 for ; Tue, 24 May 2016 15:31:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 751E828233 for ; Tue, 24 May 2016 15:31:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A17C2829F; Tue, 24 May 2016 15:31:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 3127728233 for ; Tue, 24 May 2016 15:31:34 +0000 (UTC) Received: from localhost ([::1]:53962 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5EIv-00064C-60 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 24 May 2016 11:31:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5ECW-0000NN-Cn for qemu-devel@nongnu.org; Tue, 24 May 2016 11:24:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5ECQ-0004Uh-DT for qemu-devel@nongnu.org; Tue, 24 May 2016 11:24:55 -0400 Received: from orth.archaic.org.uk ([81.2.115.148]:49459) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5ECQ-0004Ty-74 for qemu-devel@nongnu.org; Tue, 24 May 2016 11:24:50 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1b5ECG-0002xs-OW; Tue, 24 May 2016 16:24:40 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 24 May 2016 16:24:36 +0100 Message-Id: <1464103479-26913-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464103479-26913-1-git-send-email-peter.maydell@linaro.org> References: <1464103479-26913-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: 81.2.115.148 Subject: [Qemu-devel] [PATCH 1/4] clean-includes: Add glib.h to list of unneeded includes 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, patches@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP osdep.h pulls in glib.h via glib-compat.h, so add it to the list of includes that we remove. (This then means we must avoid running clean-includes on glib-compat.h or it will delete the glib.h include.) Signed-off-by: Peter Maydell --- scripts/clean-includes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index 72b47f1..23d70a0 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -104,6 +104,7 @@ for f in "$@"; do ;; *include/qemu/osdep.h | \ *include/qemu/compiler.h | \ + *include/glib-compat.h | \ *include/standard-headers/ ) # Removing include lines from osdep.h itself would be counterproductive. echo "SKIPPING $f (special case header)" @@ -143,7 +144,7 @@ for f in "$@"; do - + "sysemu/os-posix.h, sysemu/os-win32.h "glib-compat.h" "qemu/typedefs.h" ))' "$f"