fix uint64_t types; reported by Tom G. Christensen

diff --git a/defines.h b/defines.h
index b02f2942a9b560040a431b303aaca0641c509924..c1c21aba616eb0dac1e5782d54c0ab93fbc591ae 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -653,14 +653,14 @@ struct winsize {
        ((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)
+       (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))