From patchwork Wed Apr 2 14:06:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 336352 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 D5B2C1400FC for ; Thu, 3 Apr 2014 01:07:16 +1100 (EST) Received: from localhost ([::1]:38872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVLow-000382-7y for incoming@patchwork.ozlabs.org; Wed, 02 Apr 2014 10:07:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVLoY-0002r1-9G for qemu-devel@nongnu.org; Wed, 02 Apr 2014 10:06:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WVLoQ-00070T-R0 for qemu-devel@nongnu.org; Wed, 02 Apr 2014 10:06:50 -0400 Received: from mout.web.de ([212.227.15.4]:55501) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WVLoQ-0006y2-HV for qemu-devel@nongnu.org; Wed, 02 Apr 2014 10:06:42 -0400 Received: from envy.de ([195.135.221.2]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0M8iH2-1WJHWG1RS0-00C6mK; Wed, 02 Apr 2014 16:06:40 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Wed, 2 Apr 2014 16:06:38 +0200 Message-Id: <1396447598-11205-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 X-Provags-ID: V03:K0:5Gw668pvSMf13ysmlEyWx7EZjzW0ujSYFaTeM1iEGJnFfXBLOdb Yi+NXiDikU+aQljRUaY9hXIOCgrkVDPR0QHNbUpvowSJy2jEQ87mOvGpbEx12+TarVkqPif 7hHbQgYpPlZqAAyOK6GQRlsc1wjIsC9VxqzsOAhPa1MR6zGV82QShbPuZ3T0xSdPwbp2hZU MMxotvtqJANpSX5g68/WQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.4 Cc: peter.maydell@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , rth@twiddle.net Subject: [Qemu-devel] [RFC for-2.0] bswap: Fix build on FreeBSD 10.0 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 FreeBSD 10.0-RELEASE has bswap16() etc. macros defined in sys/endian.h, which leads to a conflict with our static inline definitions. Force using the system version of the macros. Signed-off-by: Andreas Färber --- On 9.0-RELEASE I did not have this issue, so unsure if some version check is needed or some more generic configure check? include/qemu/bswap.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index 0cb7c05..0f9c6cf 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -11,6 +11,8 @@ # include # include # include +#elif defined(__FreeBSD__) +# include #elif defined(CONFIG_BYTESWAP_H) # include