From 1cdde7ba6a2ba3b35737380f49242e8229302a3d Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 19 Jul 2022 14:30:01 +1000 Subject: Fix AVR compilation of FNV by using standard integer typenames. (#17716) --- lib/fnv/fnv.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/fnv/fnv.h b/lib/fnv/fnv.h index 2083a4aa23..5249366731 100644 --- a/lib/fnv/fnv.h +++ b/lib/fnv/fnv.h @@ -76,7 +76,8 @@ #if !defined(__FNV_H__) #define __FNV_H__ -#include +#include +#include #define FNV_VERSION "5.0.2" /* @(#) FNV Version */ @@ -84,7 +85,7 @@ /* * 32 bit FNV-0 hash type */ -typedef u_int32_t Fnv32_t; +typedef uint32_t Fnv32_t; /* @@ -122,10 +123,10 @@ typedef u_int32_t Fnv32_t; * 64 bit FNV-0 hash */ #if defined(HAVE_64BIT_LONG_LONG) -typedef u_int64_t Fnv64_t; +typedef uint64_t Fnv64_t; #else /* HAVE_64BIT_LONG_LONG */ typedef struct { - u_int32_t w32[2]; /* w32[0] is low order, w32[1] is high order word */ + uint32_t w32[2]; /* w32[0] is low order, w32[1] is high order word */ } Fnv64_t; #endif /* HAVE_64BIT_LONG_LONG */ -- cgit v1.2.1