Some merge fixes.

[rsync-patches.git] / xxh3.diff

diff --git a/xxh3.diff b/xxh3.diff
index 49491e9dad5b5ed873714dd89ec185696ce5b4a3..5b0e5295ab892a5673b64f8e4714002d4061f8fe 100644 (file)
--- a/xxh3.diff
+++ b/xxh3.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 194cee671d5e178f20c4494f41911fa8db942935
+based-on: 5eda68f11bf6efe782cca60a2415191f4532c3b5
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c
@@ -20,7 +20,7 @@ diff --git a/checksum.c b/checksum.c
  #include "rsync.h"
  
  #ifdef SUPPORT_XXHASH
- #include "xxhash.h"
+ #include <xxhash.h>
 -# if XXH_VERSION_NUMBER >= 800
 +# if XXH_VERSION_NUMBER >= 800 || defined XXH_INLINE_ALL
  #  define SUPPORT_XXH3 1