diff options
| author | Damien Miller <djm@mindrot.org> | 2024-10-27 03:28:11 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-10-27 03:28:11 +0100 |
| commit | ef7c26cd2f0f9a8222f851d1e551f6dfd3113f8b (patch) | |
| tree | dc9dcc0806a349ffd941ace632ab59995c3b2bc1 | |
| parent | upstream: explicitly include endian.h (diff) | |
| download | openssh-ef7c26cd2f0f9a8222f851d1e551f6dfd3113f8b.tar.xz openssh-ef7c26cd2f0f9a8222f851d1e551f6dfd3113f8b.zip | |
htole64() etc for systems without endian.h
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | defines.h | 26 |
2 files changed, 26 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 97e4ee577..4e0539fa2 100644 --- a/configure.ac +++ b/configure.ac @@ -2008,7 +2008,6 @@ AC_CHECK_FUNCS([ \ strtoll \ strtoul \ strtoull \ - swap32 \ sysconf \ tcgetpgrp \ timegm \ @@ -646,6 +646,32 @@ struct winsize { # endif /* WORDS_BIGENDIAN */ #endif /* BYTE_ORDER */ +#ifndef HAVE_ENDIAN_H +# define openssh_swap32(v) \ + (uint32_t)(((uint32_t)(v) & 0xff) << 24 | \ + ((uint32_t)(v) & 0xff00) << 8 | \ + ((uint32_t)(v) & 0xff0000) >> 8 | \ + ((uint32_t)(v) & 0xff000000) >> 24) +# define openssh_swap64(v) \ + (__uint64_t)((((__uint64_t)(v) & 0xff) << 56) | \ + ((__uint64_t)(v) & 0xff00ULL) << 40 | \ + ((__uint64_t)(v) & 0xff0000ULL) << 24 | \ + ((__uint64_t)(v) & 0xff000000ULL) << 8 | \ + ((__uint64_t)(v) & 0xff00000000ULL) >> 8 | \ + ((__uint64_t)(v) & 0xff0000000000ULL) >> 24 | \ + ((__uint64_t)(v) & 0xff000000000000ULL) >> 40 | \ + ((__uint64_t)(v) & 0xff00000000000000ULL) >> 56) +# ifdef WORDS_BIGENDIAN +# define le32toh(v) (openssh_swap32(v)) +# define le64toh(v) (openssh_swap64(v)) +# define htole64(v) (openssh_swap64(v)) +# else +# define le32toh(v) ((uint32_t)v) +# define le64toh(v) ((uint64_t)v) +# define htole64(v) ((uint64_t)v) +# endif +#endif + /* Function replacement / compatibility hacks */ #if !defined(HAVE_GETADDRINFO) && (defined(HAVE_OGETADDRINFO) || defined(HAVE_NGETADDRINFO)) |