aboutsummaryrefslogtreecommitdiff
path: root/sys/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys/sys')
-rw-r--r--sys/sys/_endian.h36
-rw-r--r--sys/sys/endian.h42
2 files changed, 41 insertions, 37 deletions
diff --git a/sys/sys/_endian.h b/sys/sys/_endian.h
index 936962cc729f..72e1a40a8deb 100644
--- a/sys/sys/_endian.h
+++ b/sys/sys/_endian.h
@@ -32,7 +32,7 @@
#ifndef _SYS__ENDIAN_H_
#define _SYS__ENDIAN_H_
-#ifndef _MACHINE_ENDIAN_H_
+#if !defined(_MACHINE_ENDIAN_H_) && !defined(_ENDIAN_H_)
#error "sys/_endian.h should not be included directly"
#endif
@@ -89,4 +89,38 @@
#define __ntohs(x) ((__uint16_t)(x))
#endif
+/*
+ * Host to big endian, host to little endian, big endian to host, and little
+ * endian to host byte order functions as detailed in byteorder(9).
+ */
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+#define htobe16(x) __bswap16((x))
+#define htobe32(x) __bswap32((x))
+#define htobe64(x) __bswap64((x))
+#define htole16(x) ((uint16_t)(x))
+#define htole32(x) ((uint32_t)(x))
+#define htole64(x) ((uint64_t)(x))
+
+#define be16toh(x) __bswap16((x))
+#define be32toh(x) __bswap32((x))
+#define be64toh(x) __bswap64((x))
+#define le16toh(x) ((uint16_t)(x))
+#define le32toh(x) ((uint32_t)(x))
+#define le64toh(x) ((uint64_t)(x))
+#else /* _BYTE_ORDER != _LITTLE_ENDIAN */
+#define htobe16(x) ((uint16_t)(x))
+#define htobe32(x) ((uint32_t)(x))
+#define htobe64(x) ((uint64_t)(x))
+#define htole16(x) __bswap16((x))
+#define htole32(x) __bswap32((x))
+#define htole64(x) __bswap64((x))
+
+#define be16toh(x) ((uint16_t)(x))
+#define be32toh(x) ((uint32_t)(x))
+#define be64toh(x) ((uint64_t)(x))
+#define le16toh(x) __bswap16((x))
+#define le32toh(x) __bswap32((x))
+#define le64toh(x) __bswap64((x))
+#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
+
#endif /* _SYS__ENDIAN_H_ */
diff --git a/sys/sys/endian.h b/sys/sys/endian.h
index faac0458ae2c..d91c442e9238 100644
--- a/sys/sys/endian.h
+++ b/sys/sys/endian.h
@@ -56,48 +56,19 @@ typedef __uint64_t uint64_t;
#endif
/*
+ * Note: While tempting to try to avoid namespace pollution from this file,
+ * several software packages assume these marcos are defined, even when it
+ * defines _POSIX_C_SOURCE to request an unpolluted namespace.
+ */
+
+/*
* General byte order swapping functions.
*/
#define bswap16(x) __bswap16(x)
#define bswap32(x) __bswap32(x)
#define bswap64(x) __bswap64(x)
-/*
- * Host to big endian, host to little endian, big endian to host, and little
- * endian to host byte order functions as detailed in byteorder(9).
- */
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define htobe16(x) __bswap16((x))
-#define htobe32(x) __bswap32((x))
-#define htobe64(x) __bswap64((x))
-#define htole16(x) ((uint16_t)(x))
-#define htole32(x) ((uint32_t)(x))
-#define htole64(x) ((uint64_t)(x))
-
-#define be16toh(x) __bswap16((x))
-#define be32toh(x) __bswap32((x))
-#define be64toh(x) __bswap64((x))
-#define le16toh(x) ((uint16_t)(x))
-#define le32toh(x) ((uint32_t)(x))
-#define le64toh(x) ((uint64_t)(x))
-#else /* _BYTE_ORDER != _LITTLE_ENDIAN */
-#define htobe16(x) ((uint16_t)(x))
-#define htobe32(x) ((uint32_t)(x))
-#define htobe64(x) ((uint64_t)(x))
-#define htole16(x) __bswap16((x))
-#define htole32(x) __bswap32((x))
-#define htole64(x) __bswap64((x))
-
-#define be16toh(x) ((uint16_t)(x))
-#define be32toh(x) ((uint32_t)(x))
-#define be64toh(x) ((uint64_t)(x))
-#define le16toh(x) __bswap16((x))
-#define le32toh(x) __bswap32((x))
-#define le64toh(x) __bswap64((x))
-#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
-
/* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
-
static __inline uint16_t
be16dec(const void *pp)
{
@@ -203,5 +174,4 @@ le64enc(void *pp, uint64_t u)
le32enc(p, (uint32_t)(u & 0xffffffffU));
le32enc(p + 4, (uint32_t)(u >> 32));
}
-
#endif /* _SYS_ENDIAN_H_ */