From patchwork Sun Jun 5 07:43:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 630389 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rMwRt0cqJz9t63 for ; Sun, 5 Jun 2016 21:23:06 +1000 (AEST) Received: from localhost ([::1]:36561 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9W91-0002iC-PL for incoming@patchwork.ozlabs.org; Sun, 05 Jun 2016 07:23:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9W7g-0001Oc-Cu for qemu-devel@nongnu.org; Sun, 05 Jun 2016 07:21:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9W7f-0003l4-6p for qemu-devel@nongnu.org; Sun, 05 Jun 2016 07:21:40 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:36367) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9W7e-0003kV-VX; Sun, 05 Jun 2016 07:21:39 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id BF19C40923; Sun, 5 Jun 2016 14:21:29 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 2594FB00; Sun, 5 Jun 2016 10:43:38 +0300 (MSK) Received: (nullmailer pid 1147 invoked by uid 1000); Sun, 05 Jun 2016 07:43:32 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 5 Jun 2016 10:43:05 +0300 Message-Id: <8a9b270bfda0beb0489257ca2bd8d8977f64e411.1465112552.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 28/52] 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, Peter Maydell , Michael Tokarev Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell 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 Reviewed-by: Eric Blake Tested-by: Eric Blake Signed-off-by: Michael Tokarev --- scripts/clean-includes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index adffedd..37b73b5 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"