merge xxh3 implementation within xxhash.h

xxh3.h is no longer necessary
but remains available,
in case some programs do #include "xxh3.h" directly.

Also : bumped version number to v0.8.0
This commit is contained in:
Yann Collet 2020-07-23 10:22:45 -07:00
parent 68da9a254e
commit 2c992d0cc7
6 changed files with 2684 additions and 2686 deletions

View File

@ -95,9 +95,9 @@ dispatch: CPPFLAGS += -DXXHSUM_DISPATCH=1
dispatch: xxhash.o xxh_x86dispatch.o xxhsum.c
$(CC) $(FLAGS) $^ $(LDFLAGS) -o $@$(EXT)
xxhash.o: xxhash.c xxhash.h xxh3.h
xxhsum.o: xxhsum.c xxhash.h xxh3.h xxh_x86dispatch.h
xxh_x86dispatch.o: xxh_x86dispatch.c xxh_x86dispatch.h xxhash.h xxh3.h
xxhash.o: xxhash.c xxhash.h
xxhsum.o: xxhsum.c xxhash.h xxh_x86dispatch.h
xxh_x86dispatch.o: xxh_x86dispatch.c xxh_x86dispatch.h xxhash.h
.PHONY: xxhsum_and_links
xxhsum_and_links: xxhsum xxh32sum xxh64sum xxh128sum
@ -423,7 +423,7 @@ install: lib pkgconfig xxhsum ## install libraries, CLI, links and man page
@ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT)
@$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR) # includes
@$(INSTALL_DATA) xxhash.h $(DESTDIR)$(INCLUDEDIR)
@$(INSTALL_DATA) xxh3.h $(DESTDIR)$(INCLUDEDIR)
@$(INSTALL_DATA) xxh3.h $(DESTDIR)$(INCLUDEDIR) # for compatibility, will be removed in v0.9.0
ifeq ($(DISPATCH),1)
@$(INSTALL_DATA) xxh_x86dispatch.h $(DESTDIR)$(INCLUDEDIR)
endif

View File

@ -47,7 +47,7 @@ test_multiInclude:
# ! $(NM) multiInclude | $(GREP) TESTN_
#@$(MAKE) clean
xxhsum$(EXT): ../xxhash.c ../xxhash.h ../xxh3.h ../xxhsum.c
xxhsum$(EXT): ../xxhash.c ../xxhash.h ../xxhsum.c
$(CC) $(CFLAGS) $(LDFLAGS) ../xxhash.c ../xxhsum.c -o $@
# Make sure that Unicode filenames work.

View File

@ -63,8 +63,8 @@
*/
/* === xxHash === */
#include "xxh3.h"
#define XXH_INLINE_ALL
#include "xxhash.h"
size_t XXH32_wrapper(const void* src, size_t srcSize, void* dst, size_t dstCapacity, void* customPayload)
{

View File

@ -45,7 +45,7 @@ all: release
collisionsTest: main.o pool.o threading.o sort.o $(HASH_OBJ)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
main.o: hashes.h xxh3.h xxhash.h
main.o: hashes.h xxhash.h
release: CXXFLAGS += -O3
release: CFLAGS += -O3

2682
xxh3.h

File diff suppressed because it is too large Load Diff

2672
xxhash.h

File diff suppressed because it is too large Load Diff