diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2017-02-12 16:40:38 +0100 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2017-02-12 22:19:50 +0100 |
| commit | cf5087a8397e379d059998b27ef86a1bb68d70ff (patch) | |
| tree | f4fca20a30f47a42df41adfe1f2b4bda8a54b19c /include | |
| parent | 98a15feabb6a14e52a54a09dfed58d55e0f99884 (diff) | |
| download | ouroboros-cf5087a8397e379d059998b27ef86a1bb68d70ff.tar.gz ouroboros-cf5087a8397e379d059998b27ef86a1bb68d70ff.zip | |
include: Use width in endian naming convention
ntohll and ntohl have been renamed ntoh64 and ntoh32, htonll and htonl
have been renamed hton64 and hton32.
Diffstat (limited to 'include')
| -rw-r--r-- | include/ouroboros/endian.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/include/ouroboros/endian.h b/include/ouroboros/endian.h index c6b0d80a..745f0c57 100644 --- a/include/ouroboros/endian.h +++ b/include/ouroboros/endian.h @@ -132,23 +132,15 @@ static inline uint64_t bswap_64(uint64_t x) { #endif #ifdef CPU_LITTLE_ENDIAN -#define htonll(x) bswap_64(x) -#ifndef htonl -#define htonl(x) bswap_32(x) -#endif -#define ntohll(x) bswap_64(x) -#ifndef ntohl -#define ntohl(x) bswap_32(x) -#endif +#define hton64(x) bswap_64(x) +#define hton32(x) bswap_32(x) +#define ntoh64(x) bswap_64(x) +#define ntoh32(x) bswap_32(x) #else /* CPU_LITTLE_ENDIAN */ -#define htonll(x) (x) -#ifndef htonl -#define htonl(x) (x) -#endif -#define ntohll(x) (x) -#ifndef ntohl -#define nothl(x) (x) -#endif +#define hton64(x) (x) +#define hton32(x) (x) +#define ntoh64(x) (x) +#define noth32(x) (x) #endif /* CPU_LITTLE_ENDIAN */ #endif /* OUROBOROS_ENDIAN_H */ |