diff options
author | Andrew <forkk@forkk.net> | 2013-11-04 19:58:56 -0600 |
---|---|---|
committer | Andrew <forkk@forkk.net> | 2013-11-04 19:58:56 -0600 |
commit | 5083a6a8090fa03d3c1800c1f9588079ca11e9f9 (patch) | |
tree | 7c2e88c7184a7f5acf5e7a03be5c5f0bf6904113 /depends/xz-embedded/src/xz_lzma2.h | |
parent | dc3b0fcb2b74aeede37b08216b203cab284f7fce (diff) | |
parent | bb7e8985f6d189de0acac6a1c3033cb16378c1fb (diff) | |
download | MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.gz MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.lz MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.xz MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.zip |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'depends/xz-embedded/src/xz_lzma2.h')
-rw-r--r-- | depends/xz-embedded/src/xz_lzma2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/depends/xz-embedded/src/xz_lzma2.h b/depends/xz-embedded/src/xz_lzma2.h index 071d67be..3976033a 100644 --- a/depends/xz-embedded/src/xz_lzma2.h +++ b/depends/xz-embedded/src/xz_lzma2.h @@ -39,7 +39,8 @@ * The symbol names are in from STATE_oldest_older_previous. REP means * either short or long repeated match, and NONLIT means any non-literal. */ -enum lzma_state { +enum lzma_state +{ STATE_LIT_LIT, STATE_MATCH_LIT_LIT, STATE_REP_LIT_LIT, @@ -146,8 +147,7 @@ static inline bool lzma_state_is_literal(enum lzma_state state) */ static inline uint32_t lzma_get_dist_state(uint32_t len) { - return len < DIST_STATES + MATCH_LEN_MIN - ? len - MATCH_LEN_MIN : DIST_STATES - 1; + return len < DIST_STATES + MATCH_LEN_MIN ? len - MATCH_LEN_MIN : DIST_STATES - 1; } /* @@ -192,7 +192,7 @@ static inline uint32_t lzma_get_dist_state(uint32_t len) #define ALIGN_MASK (ALIGN_SIZE - 1) /* Total number of all probability variables */ -#define PROBS_TOTAL (1846 + LITERAL_CODERS_MAX * LITERAL_CODER_SIZE) +#define PROBS_TOTAL (1846 + LITERAL_CODERS_MAX *LITERAL_CODER_SIZE) /* * LZMA remembers the four most recent match distances. Reusing these |