From patchwork Thu Feb 18 18:05:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 584870 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 CCCBD1401DA for ; Fri, 19 Feb 2016 05:24:57 +1100 (AEDT) Received: from localhost ([::1]:44173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWTG3-0000Xf-Pc for incoming@patchwork.ozlabs.org; Thu, 18 Feb 2016 13:24:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWTFN-0007fP-Oo for qemu-devel@nongnu.org; Thu, 18 Feb 2016 13:24:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWTFM-00071x-Bp for qemu-devel@nongnu.org; Thu, 18 Feb 2016 13:24:13 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:38439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWTFM-0006yz-0Z for qemu-devel@nongnu.org; Thu, 18 Feb 2016 13:24:12 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.84) (envelope-from ) id 1aWSxC-000204-4O; Thu, 18 Feb 2016 18:05:26 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 18 Feb 2016 18:05:20 +0000 Message-Id: <1455818725-7647-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1455818725-7647-1-git-send-email-peter.maydell@linaro.org> References: <1455818725-7647-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::1 Cc: patches@linaro.org Subject: [Qemu-devel] [PATCH 3/8] disas/arm-a64.cc: Include osdep.h first 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Rearrange include directives so that we include osdep.h first. This has to be done manually because clean-includes doesn't handle C++. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake --- disas/arm-a64.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/disas/arm-a64.cc b/disas/arm-a64.cc index d4d46d5..9280950 100644 --- a/disas/arm-a64.cc +++ b/disas/arm-a64.cc @@ -17,12 +17,13 @@ * along with this program. If not, see . */ -#include "vixl/a64/disasm-a64.h" - extern "C" { +#include "qemu/osdep.h" #include "disas/bfd.h" } +#include "vixl/a64/disasm-a64.h" + using namespace vixl; static Decoder *vixl_decoder = NULL;