summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/mspack/kwajd.c
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2013-03-11 18:51:11 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2013-11-04 22:15:00 +0100
commit289acf3333cf76ffc689aff8a17340b299ce0686 (patch)
treebf90342b8fb10132cdc6f91fae020ef89c0e8954 /rbutil/rbutilqt/mspack/kwajd.c
parent739a7ae0e9acb27227f5473a003833ea5a9c97ef (diff)
downloadrockbox-289acf3333cf76ffc689aff8a17340b299ce0686.tar.gz
rockbox-289acf3333cf76ffc689aff8a17340b299ce0686.zip
Fix libmspack to compile with rbutil
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>
Diffstat (limited to 'rbutil/rbutilqt/mspack/kwajd.c')
-rw-r--r--rbutil/rbutilqt/mspack/kwajd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/mspack/kwajd.c b/rbutil/rbutilqt/mspack/kwajd.c
index d891b6a7e3..440f1dcfdd 100644
--- a/rbutil/rbutilqt/mspack/kwajd.c
+++ b/rbutil/rbutilqt/mspack/kwajd.c
@@ -12,8 +12,8 @@
12 12
13/* KWAJ decompression implementation */ 13/* KWAJ decompression implementation */
14 14
15#include <system.h> 15#include "system-mspack.h"
16#include <kwaj.h> 16#include "kwaj.h"
17 17
18/* prototypes */ 18/* prototypes */
19static struct mskwajd_header *kwajd_open( 19static struct mskwajd_header *kwajd_open(
@@ -361,7 +361,7 @@ static int kwajd_error(struct mskwaj_decompressor *base)
361 } \ 361 } \
362 INJECT_BITS(*i_ptr++, 8); \ 362 INJECT_BITS(*i_ptr++, 8); \
363} while (0) 363} while (0)
364#include <readbits.h> 364#include "readbits.h"
365 365
366/* import huffman-reading macros and code */ 366/* import huffman-reading macros and code */
367#define TABLEBITS(tbl) KWAJ_TABLEBITS 367#define TABLEBITS(tbl) KWAJ_TABLEBITS
@@ -369,7 +369,7 @@ static int kwajd_error(struct mskwaj_decompressor *base)
369#define HUFF_TABLE(tbl,idx) lzh->tbl##_table[idx] 369#define HUFF_TABLE(tbl,idx) lzh->tbl##_table[idx]
370#define HUFF_LEN(tbl,idx) lzh->tbl##_len[idx] 370#define HUFF_LEN(tbl,idx) lzh->tbl##_len[idx]
371#define HUFF_ERROR return MSPACK_ERR_DATAFORMAT 371#define HUFF_ERROR return MSPACK_ERR_DATAFORMAT
372#include <readhuff.h> 372#include "readhuff.h"
373 373
374/* In the KWAJ LZH format, there is no special 'eof' marker, it just 374/* In the KWAJ LZH format, there is no special 'eof' marker, it just
375 * ends. Depending on how many bits are left in the final byte when 375 * ends. Depending on how many bits are left in the final byte when