From patchwork Sat May 13 01:54:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamil Rytarowski X-Patchwork-Id: 9724971 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 1E4CB60325 for ; Sat, 13 May 2017 02:03:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB3BE288A9 for ; Sat, 13 May 2017 02:03:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCADB288F4; Sat, 13 May 2017 02:03:44 +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,FREEMAIL_FROM, 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 28594288A9 for ; Sat, 13 May 2017 02:03:43 +0000 (UTC) Received: from localhost ([::1]:56008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9MPG-00049W-Qn for patchwork-qemu-devel@patchwork.kernel.org; Fri, 12 May 2017 22:03:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d9MOd-000481-HK for qemu-devel@nongnu.org; Fri, 12 May 2017 22:03:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d9MOY-0004Fr-Mp for qemu-devel@nongnu.org; Fri, 12 May 2017 22:03:03 -0400 Received: from mout.gmx.net ([212.227.17.22]:57215) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d9MOY-0004EU-Cz for qemu-devel@nongnu.org; Fri, 12 May 2017 22:02:58 -0400 Received: from localhost.localdomain ([185.58.161.191]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MPppG-1d4QiK43oA-004yaD; Sat, 13 May 2017 04:02:47 +0200 From: Kamil Rytarowski To: qemu-devel@nongnu.org Date: Sat, 13 May 2017 03:54:49 +0200 Message-Id: <20170513015449.24061-1-n54@gmx.com> X-Mailer: git-send-email 2.12.2 X-Provags-ID: V03:K0:jLbFZC5G0JXFgTLhpMYTOteg/rhP+plLAC+8Q4plxOayu0QEcVL qaZ21+xy/+P3pQOHkXHMDTfpyNa8qQ1CNwNTZOHUsaah7iWsv5PqDna+nKaCL09qi+HMQcr O9reIf+Dq757rbvgsDAoqsUf0e/r5Oa/LzmsasF9DRytKdBFG4bqNh+ZOo3K7QVr7uQdeni vMZdiQmJUOidkfqf9cpNA== X-UI-Out-Filterresults: notjunk:1; V01:K0:rzJvMJ/uwZY=:b3/CfER34XIRaiFY9q49Ta YkTw6jKpQHRPyZlAh79+OB+VxjlKP0O3oQ1L2cRob+CLB6m34e0okgnic4KZ2vx7d4VaupDoI S6I3eaCbwPADTS8gv7YF43o8Kr8KYY9YExNpnim6f+7lVUG6pOTQTEM3g3NFHelROIdJM4zsF Jw9Xo8MSdcoG4SKjq+iA+J3T3z4j72qKSAtQTqJ2als59EG++omMhLz9ME1IMhlcLqjXkznri A5arqgBrST8lD6hWUrdyUev5q6RCuJtnZGI3REG5k7CXJ9ZjuYobB9g4IxPs7F6xQ27I4+3q3 5odtwOgwwYlfmVSIX7acq13uIHdyxo8TWIjdAIOpC2uyTCrJEoWChj8FReQw304KQdZ+8p5Sd 0m0PJ2NFc9So6WnGS25Q2kOGV2UXahUVf/U+HTztnOXTR4cgd2fI/Lpb6GQBIlGoBq66848CO ceTw1GimhZzgHoxiKwBfHwfzUiwiNo/PWfLTTQWX8zxywIDaoXw3OtPNR3Y2WesfUWWlVNYp8 jh3hT8Suj5pnJFQfCYXHFE1GL2JkyrM0QvSXGgxcb13mLmblJo0+0jb2TOgqHnLmGyzDB2o2n Sfsjzoi+ZTrFB2EIHLO+HjA7KpYTLsz2/aRcMJ+k0gtwS9Lwm0zo2BfueK4EXwAdInknguCv5 DHCH+msfKnCLsyw2x4Z7QWgr+coSFF+I4+RlWdsNACFJ/U4v4Ka7TJ9SMtEs375jZu0tZtPLI +PV0vFFTLDfyicwkaJmRS/3k27QWhA8G2kgzIc9hngiMVIvTmlF3+rVDRPc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.22 Subject: [Qemu-devel] [PATCH] libvixl: Correct ordering of includes and fix NetBSD build 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: peter.maydell@linaro.org, Kamil Rytarowski , claudio.fontana@huawei.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The __STDC_CONSTANT_MACROS symbol must be defined before including directly or indirectly in order to get support for macros for integer constants like INT8_C(). The vixl/globals.h headers defines __STDC_CONSTANT_MACROS and must be included before other system headers. This change fixes build failures on NetBSD. Signed-off-by: Kamil Rytarowski --- disas/libvixl/vixl/a64/disasm-a64.cc | 2 +- disas/libvixl/vixl/utils.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/disas/libvixl/vixl/a64/disasm-a64.cc b/disas/libvixl/vixl/a64/disasm-a64.cc index 7a58a5c087..fc87306893 100644 --- a/disas/libvixl/vixl/a64/disasm-a64.cc +++ b/disas/libvixl/vixl/a64/disasm-a64.cc @@ -24,8 +24,8 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include #include "vixl/a64/disasm-a64.h" +#include namespace vixl { diff --git a/disas/libvixl/vixl/utils.h b/disas/libvixl/vixl/utils.h index 5ab134e240..17034addbc 100644 --- a/disas/libvixl/vixl/utils.h +++ b/disas/libvixl/vixl/utils.h @@ -27,10 +27,10 @@ #ifndef VIXL_UTILS_H #define VIXL_UTILS_H -#include -#include #include "vixl/globals.h" #include "vixl/compiler-intrinsics.h" +#include +#include namespace vixl {