Merge experimental LZX compressor

[wimlib] / src / compress.c

diff --git a/src/compress.c b/src/compress.c
index e7e199149edc7574bd258e605d2ed27a41b54cb3..dfaabe6b1c49d42e42ec035cb9de64e5e0b6250a 100644 (file)
--- a/src/compress.c
+++ b/src/compress.c
@@ -38,7 +38,7 @@
 static inline void
 flush_bits(struct output_bitstream *ostream)
 {
-       *(u16*)ostream->bit_output = cpu_to_le16(ostream->bitbuf);
+       *(le16*)ostream->bit_output = cpu_to_le16(ostream->bitbuf);
        ostream->bit_output = ostream->next_bit_output;
        ostream->next_bit_output = ostream->output;
        ostream->output += 2;
@@ -237,9 +237,9 @@ huffman_tree_compute_path_lengths(HuffmanNode *base_node, u16 cur_len)
 void
 make_canonical_huffman_code(unsigned num_syms,
                            unsigned max_codeword_len,
-                           const freq_t * restrict freq_tab,
-                           u8 * restrict lens,
-                           u16 * restrict codewords)
+                           const freq_t freq_tab[restrict],
+                           u8 lens[restrict],
+                           u16 codewords[restrict])
 {
        /* We require at least 2 possible symbols in the alphabet to produce a
         * valid Huffman decoding table. It is allowed that fewer than 2 symbols