Re: [PATCH] make get_be64() compile on pu with NO_UNALIGNED_LOADS
Martin Ågren <martin.agren@gmail.com> writes:
> Applies to pu and passes the tests. I think this should be squashed in
> somewhere. Perhaps a mismerge in commit d553324d ("Merge branch
> 'bp/fsmonitor' into pu", 2017-07-21).Yes, you spotted a mistaken evil-merge. Thanks.
Show 23 quoted lines
>
> compat/bswap.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/compat/bswap.h b/compat/bswap.h
> index 133da1d2b..f86110a72 100644
> --- a/compat/bswap.h
> +++ b/compat/bswap.h
> @@ -188,11 +188,11 @@ static inline void put_be32(void *ptr, uint32_t value)
> p[3] = value >> 0;
> }
>
> -static inline unit64_t get_be64(const void *ptr)
> +static inline uint64_t get_be64(const void *ptr)
> {
> - unsigned char *p = ptr;
> + const unsigned char *p = ptr;
> return ((uint64_t)get_be32(p) << 32) |
> - ((uint64_t)get_be32(p + 4);
> + ((uint64_t)get_be32(p + 4));
> }
>
> #endifJunio C Hamano <gitster@pobox.com>