Fix up xxhash

diff --git a/contrib/linux-kernel/lib/xxhash.c b/contrib/linux-kernel/lib/xxhash.c
index 05ebedf7ff17a1820ad8b18cb11693f6f248a3e7..43c2c52962a2e6e307f7490e35781eb550b095f2 100644 (file)
--- a/contrib/linux-kernel/lib/xxhash.c
+++ b/contrib/linux-kernel/lib/xxhash.c
@@ -81,17 +81,6 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcp
 #define FORCE_INLINE static __always_inline
 
 
-static U32 XXH_read32(const void* memPtr)
-{
-       return MEM_read32(memPtr);
-}
-
-static U64 XXH_read64(const void* memPtr)
-{
-       return MEM_read64(memPtr);
-}
-
-
 /* ****************************************
 *  Compiler-specific Functions and Macros
 ******************************************/

diff --git a/contrib/linux-kernel/lib/xxhash.h b/contrib/linux-kernel/lib/xxhash.h
index 36d140eca872540f9e2648ff00219802490f8f7a..974a81c489b4944189bc2813b476dc39fe780028 100644 (file)
--- a/contrib/linux-kernel/lib/xxhash.h
+++ b/contrib/linux-kernel/lib/xxhash.h
@@ -177,8 +177,8 @@ When done, free XXH state space if it was allocated dynamically.
 /* **************************
 *  Utils
 ****************************/
-XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* restrict dst_state, const XXH32_state_t* restrict src_state);
-XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* restrict dst_state, const XXH64_state_t* restrict src_state);
+XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dst_state, const XXH32_state_t* src_state);
+XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* dst_state, const XXH64_state_t* src_state);
 
 
 /* **************************