From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 2 Apr 2014 16:06:38 +0200 Message-Id: <1396447598-11205-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [RFC for-2.0] bswap: Fix build on FreeBSD 10.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , rth@twiddle.net 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 -- 1.8.4.5