From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60664) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrHnZ-00085T-LS for qemu-devel@nongnu.org; Fri, 04 Jan 2013 19:39:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TrHnX-0008KZ-9P for qemu-devel@nongnu.org; Fri, 04 Jan 2013 19:39:41 -0500 Received: from mail-ie0-f181.google.com ([209.85.223.181]:56197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrHnX-0008KS-52 for qemu-devel@nongnu.org; Fri, 04 Jan 2013 19:39:39 -0500 Received: by mail-ie0-f181.google.com with SMTP id 16so20534041iea.12 for ; Fri, 04 Jan 2013 16:39:38 -0800 (PST) Sender: Richard Henderson From: Richard Henderson Date: Fri, 4 Jan 2013 16:39:26 -0800 Message-Id: <1357346373-13898-2-git-send-email-rth@twiddle.net> In-Reply-To: <1357346373-13898-1-git-send-email-rth@twiddle.net> References: <1357346373-13898-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 1/8] fdt: Use bswapN instead of bswap_N List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , Riku Voipio Fixes the libfdt enabled build for hosts that have . The code at the beginning of qemu/bswap.h is attempting to standardize on bswapN. In the case of CONFIG_MACHINE_BSWAP_H, this is all we get. In the case of CONFIG_BYTESWAP_H, we get bswap_N from the system header and then wrap these with inline functions to get bswapN. Signed-off-by: Richard Henderson --- include/libfdt_env.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/libfdt_env.h b/include/libfdt_env.h index 7938d73..3667d4c 100644 --- a/include/libfdt_env.h +++ b/include/libfdt_env.h @@ -22,15 +22,15 @@ #include "qemu/bswap.h" #ifdef HOST_WORDS_BIGENDIAN -#define fdt32_to_cpu(x) (x) -#define cpu_to_fdt32(x) (x) -#define fdt64_to_cpu(x) (x) -#define cpu_to_fdt64(x) (x) +#define fdt32_to_cpu(x) (x) +#define cpu_to_fdt32(x) (x) +#define fdt64_to_cpu(x) (x) +#define cpu_to_fdt64(x) (x) #else -#define fdt32_to_cpu(x) (bswap_32((x))) -#define cpu_to_fdt32(x) (bswap_32((x))) -#define fdt64_to_cpu(x) (bswap_64((x))) -#define cpu_to_fdt64(x) (bswap_64((x))) +#define fdt32_to_cpu(x) bswap32(x) +#define cpu_to_fdt32(x) bswap32(x) +#define fdt64_to_cpu(x) bswap64(x) +#define cpu_to_fdt64(x) bswap64(x) #endif #endif /* _LIBFDT_ENV_H */ -- 1.7.11.7