From 4ea832b8ff1d43c779a1c41dc3e3d6ff418143a4 Mon Sep 17 00:00:00 2001
From: Yann Collet <yann.collet.73@gmail.com>
Date: Wed, 6 Aug 2014 08:55:08 +0100
Subject: Updated Makefile : make dist Minor formatting changes for xxhash

---
 Makefile          | 12 +++++++-----
 programs/xxhash.c | 26 --------------------------
 programs/xxhash.h |  2 +-
 3 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/Makefile b/Makefile
index 23251e0..ebbe44d 100644
--- a/Makefile
+++ b/Makefile
@@ -33,9 +33,9 @@
 # Version numbers
 VERSION=121
 export RELEASE=r$(VERSION)
-LIBVER_MAJOR=`sed -n '/define LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
-LIBVER_MINOR=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
-LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
+LIBVER_MAJOR=`sed -n '/LZ4_VERSION_MAJOR/s/.*\s\+\([0-9]\+\).*/\1/p' < lz4.h`
+LIBVER_MINOR=`sed -n '/LZ4_VERSION_MINOR/s/.*\s\+\([0-9]\+\).*/\1/p' < lz4.h`
+LIBVER_PATCH=`sed -n '/LZ4_VERSION_RELEASE/s/.*\s\+\([0-9]\+\).*/\1/p' < lz4.h`
 LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
 
 DESTDIR=
@@ -72,9 +72,11 @@ else
 endif
 
 TEXT = lz4.c lz4.h lz4hc.c lz4hc.h \
-	lz4_format_description.txt Makefile NEWS LICENSE README.md \
+	liblz4.pc.in Makefile \
+	lz4_format_description.txt NEWS LICENSE README.md \
 	cmake_unofficial/CMakeLists.txt \
-	$(PRGDIR)/fullbench.c $(PRGDIR)/fuzzer.c $(PRGDIR)/lz4cli.c \
+	$(PRGDIR)/fullbench.c $(PRGDIR)/lz4cli.c \
+	$(PRGDIR)/datagen.c $(PRGDIR)/fuzzer.c \
 	$(PRGDIR)/lz4io.c $(PRGDIR)/lz4io.h \
 	$(PRGDIR)/bench.c $(PRGDIR)/bench.h \
 	$(PRGDIR)/xxhash.c $(PRGDIR)/xxhash.h \
diff --git a/programs/xxhash.c b/programs/xxhash.c
index 99bbe7c..a9925fc 100644
--- a/programs/xxhash.c
+++ b/programs/xxhash.c
@@ -374,8 +374,6 @@ FORCE_INLINE U64 XXH64_endian_align(const void* input, unsigned int len, U64 see
     	p+=8;
     }
 
-#if 1
-
     if (p<=bEnd-4)
     {
     	h64 ^= (U64)(XXH_get32bits(p)) * PRIME64_1;
@@ -390,30 +388,6 @@ FORCE_INLINE U64 XXH64_endian_align(const void* input, unsigned int len, U64 see
         p++;
     }
 
-#else
-
-    if( p<bEnd )
-    {
-        // Copy the remaining bytes
-        U64 k1 = PRIME64_5;
-        BYTE* _k1 = (BYTE*)&k1;
-        switch( (size_t)(bEnd-p))  // Yes, I tried multiple ways of doing this memcopy
-        {
-        case 7:	*_k1++ = *p++;
-        case 6:	*_k1++ = *p++;
-        case 5:	*_k1++ = *p++;
-        case 4:	*_k1++ = *p++;
-        case 3:	*_k1++ = *p++;
-        case 2:	*_k1++ = *p++;
-        case 1:	*_k1++ = *p++;
-        }
-
-        k1 *= PRIME64_5; k1 = XXH_rotl64(k1,31); k1 *= PRIME64_3; h64 ^= k1;
-        h64 = XXH_rotl64(h64, 11) * PRIME64_1 + PRIME64_4;
-    }
-
-#endif
-
     h64 ^= h64 >> 33;
     h64 *= PRIME64_2;
     h64 ^= h64 >> 29;
diff --git a/programs/xxhash.h b/programs/xxhash.h
index 8271807..a7516ff 100644
--- a/programs/xxhash.h
+++ b/programs/xxhash.h
@@ -155,7 +155,7 @@ use the structure XXHnn_stateSpace_t, which will ensure that memory space is lar
 unsigned int       XXH32_intermediateDigest (void* state);
 unsigned long long XXH64_intermediateDigest (void* state);
 /*
-This function does the same as XXHnn_digest(), generating a nn-bit hash,
+These functions do the same as XXHnn_digest(), generating a nn-bit hash,
 but preserve memory context.
 This way, it becomes possible to generate intermediate hashes, and then continue feeding data with XXHnn_update().
 To free memory context, use XXHnn_digest(), or free().
-- 
cgit v0.12