devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix libmspack to compile with rbutil

Browse source 
The build system used by rbutil is not very robust: all the files
are eventually compiled to the same directory so we cannot have
two files with the same name (system.c would conflicts with
system.cpp) so rename one file to avoid this. Also change all
include directives to local ones because we don't have to expose
the entire mspack source to inclusion.

Change-Id: I3fe0638d69fdc30566eb9425abfe33c807678b28
Reviewed-on: http://gerrit.rockbox.org/417
Reviewed-by: Dominik Riebeling <Dominik.Riebeling@gmail.com>
This commit is contained in:
Amaury Pouly 2013-03-11 18:51:11 +01:00 • committed by Dominik Riebeling
parent 739a7ae0e9
commit 289acf3333
26 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rbutil/rbutilqt/mspack/kwajd.c
View file

@ -12,8 +12,8 @@
/* KWAJ decompression implementation */
#include <system.h>
#include <kwaj.h>
#include "system-mspack.h"
#include "kwaj.h"
/* prototypes */
static struct mskwajd_header *kwajd_open(
@ -361,7 +361,7 @@ static int kwajd_error(struct mskwaj_decompressor *base)
} \
INJECT_BITS(*i_ptr++, 8); \
} while (0)
#include <readbits.h>
#include "readbits.h"
/* import huffman-reading macros and code */
#define TABLEBITS(tbl) KWAJ_TABLEBITS
@ -369,7 +369,7 @@ static int kwajd_error(struct mskwaj_decompressor *base)
#define HUFF_TABLE(tbl,idx) lzh->tbl##_table[idx]
#define HUFF_LEN(tbl,idx) lzh->tbl##_len[idx]
#define HUFF_ERROR return MSPACK_ERR_DATAFORMAT
#include <readhuff.h>
#include "readhuff.h"
/* In the KWAJ LZH format, there is no special 'eof' marker, it just
* ends. Depending on how many bits are left in the final byte when