As we want the cpu_to_endian() macros use the
const_le() macros, move them earlier, so they
are defined when we use them.
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
---
include/qemu/bswap.h | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index 1d3e4c24e41..c3b4277342b 100644
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -82,6 +82,25 @@ static inline void bswap64s(uint64_t *s)
#define be_bswaps(p, size) do { *p = glue(bswap, size)(*p); } while(0)
#endif
+/*
+ * Same as cpu_to_le{16,32} described below, except that gcc will
+ * figure the result is a compile-time constant if you pass in a constant.
+ * So this can be used to initialize static variables.
+ */
+#if defined(HOST_WORDS_BIGENDIAN)
+# define const_le32(_x) \
+ ((((_x) & 0x000000ffU) << 24) | \
+ (((_x) & 0x0000ff00U) << 8) | \
+ (((_x) & 0x00ff0000U) >> 8) | \
+ (((_x) & 0xff000000U) >> 24))
+# define const_le16(_x) \
+ ((((_x) & 0x00ff) << 8) | \
+ (((_x) & 0xff00) >> 8))
+#else
+# define const_le32(_x) (_x)
+# define const_le16(_x) (_x)
+#endif
+
/**
* Endianness conversion functions between host cpu and specified endianness.
* (We list the complete set of prototypes produced by the macros below
@@ -175,25 +194,6 @@ static inline uint32_t qemu_bswap_len(uint32_t value, int
len)
return bswap32(value) >> (32 - 8 * len);
}
-/*
- * Same as cpu_to_le{16,32}, except that gcc will figure the result is
- * a compile-time constant if you pass in a constant. So this can be
- * used to initialize static variables.
- */
-#if defined(HOST_WORDS_BIGENDIAN)
-# define const_le32(_x) \
- ((((_x) & 0x000000ffU) << 24) | \
- (((_x) & 0x0000ff00U) << 8) | \
- (((_x) & 0x00ff0000U) >> 8) | \
- (((_x) & 0xff000000U) >> 24))
-# define const_le16(_x) \
- ((((_x) & 0x00ff) << 8) | \
- (((_x) & 0xff00) >> 8))
-#else
-# define const_le32(_x) (_x)
-# define const_le16(_x) (_x)
-#endif
-
/* Unions for reinterpreting between floats and integers. */
typedef union {
--
2.26.2
