AuroraMiddleware/brotli
1
0
Fork 0
mirror of https://github.com/google/brotli.git synced 2025-01-15 19:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #187 from szabadka/master

Browse Source 
Define the encoder dictionary in the .cc file and link only once.
This commit is contained in:
szabadka 2015-10-01 14:51:48 +02:00
commit dc416abcb7
5 changed files with 9500 additions and 9451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dec/dictionary.c
View File

@ -15,6 +15,10 @@
#include "./dictionary.h"
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
#endif
/* In case of multiple definition linker error with dictionary.cc from the
encoder: include only one of enc/dictionary.cc or dec/dictionary.c in a
target using both enc and dec. */
@ -9465,3 +9469,7 @@ const uint8_t kBrotliDictionary[122784] = {
0x88, 0xe0, 0xa4, 0xb8, 0xe0, 0xa4, 0x95, 0xe0, 0xa5, 0x8d, 0xe0, 0xa4, 0xb0,
0xe0, 0xa4, 0xbf, 0xe0, 0xa4, 0xaf, 0xe0, 0xa4, 0xa4, 0xe0, 0xa4, 0xbe,
};
#if defined(__cplusplus) || defined(c_plusplus)
} /* extern "C" */
#endif

5
enc/Makefile
View File

@ -2,7 +2,10 @@
include ../shared.mk
OBJS = backward_references.o block_splitter.o brotli_bit_stream.o encode.o encode_parallel.o entropy_encode.o histogram.o literal_cost.o metablock.o static_dict.o streams.o
OBJS_NODICT = backward_references.o block_splitter.o brotli_bit_stream.o encode.o encode_parallel.o entropy_encode.o histogram.o literal_cost.o metablock.o static_dict.o streams.o
OBJS = $(OBJS_NODICT) dictionary.o
nodict : $(OBJS_NODICT)
all : $(OBJS)

9474
enc/dictionary.cc Normal file
View File

File diff suppressed because it is too large Load Diff

9462
enc/dictionary.h
View File

File diff suppressed because it is too large Load Diff

2
tools/Makefile
View File

@ -17,7 +17,7 @@ $(EXECUTABLES) : $(EXE_OBJS) deps
deps :
$(MAKE) -C $(BROTLI)/dec
$(MAKE) -C $(BROTLI)/enc
$(MAKE) -C $(BROTLI)/enc nodict
clean :
rm -f $(OBJS) $(EXE_OBJS) $(EXECUTABLES)