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

6
rbutil/rbutilqt/mspack/cab.h
View file

@ -10,9 +10,9 @@
#ifndef MSPACK_CAB_H #ifndef MSPACK_CAB_H
#define MSPACK_CAB_H 1 #define MSPACK_CAB_H 1
#include <mszip.h> #include "mszip.h"
#include <qtm.h> #include "qtm.h"
#include <lzx.h> #include "lzx.h"
/* generic CAB definitions */ /* generic CAB definitions */

4
rbutil/rbutilqt/mspack/cabc.c
View file

@ -9,8 +9,8 @@
/* CAB compression implementation */ /* CAB compression implementation */
#include <system.h> #include "system-mspack.h"
#include <cab.h> #include "cab.h"
struct mscab_compressor * struct mscab_compressor *
mspack_create_cab_compressor(struct mspack_system *sys) mspack_create_cab_compressor(struct mspack_system *sys)

4
rbutil/rbutilqt/mspack/cabd.c
View file

@ -21,8 +21,8 @@
/* CAB decompression implementation */ /* CAB decompression implementation */
#include <system.h> #include "system-mspack.h"
#include <cab.h> #include "cab.h"
#include <assert.h> #include <assert.h>
/* Notes on compliance with cabinet specification: /* Notes on compliance with cabinet specification:

2
rbutil/rbutilqt/mspack/chm.h
View file

@ -10,7 +10,7 @@
#ifndef MSPACK_CHM_H #ifndef MSPACK_CHM_H
#define MSPACK_CHM_H 1 #define MSPACK_CHM_H 1
#include <lzx.h> #include "lzx.h"
/* generic CHM definitions */ /* generic CHM definitions */

4
rbutil/rbutilqt/mspack/chmc.c
View file

@ -9,8 +9,8 @@
/* CHM compression implementation */ /* CHM compression implementation */
#include <system.h> #include "system-mspack.h"
#include <chm.h> #include "chm.h"
struct mschm_compressor * struct mschm_compressor *
mspack_create_chm_compressor(struct mspack_system *sys) mspack_create_chm_compressor(struct mspack_system *sys)

4
rbutil/rbutilqt/mspack/chmd.c
View file

@ -9,8 +9,8 @@
/* CHM decompression implementation */ /* CHM decompression implementation */
#include <system.h> #include "system-mspack.h"
#include <chm.h> #include "chm.h"
/* prototypes */ /* prototypes */
static struct mschmd_header * chmd_open( static struct mschmd_header * chmd_open(

2
rbutil/rbutilqt/mspack/hlp.h
View file

@ -10,7 +10,7 @@
#ifndef MSPACK_HLP_H #ifndef MSPACK_HLP_H
#define MSPACK_HLP_H 1 #define MSPACK_HLP_H 1
#include <lzss.h> #include "lzss.h"
/* generic HLP definitions */ /* generic HLP definitions */

4
rbutil/rbutilqt/mspack/hlpc.c
View file

@ -9,8 +9,8 @@
/* HLP compression implementation */ /* HLP compression implementation */
#include <system.h> #include "system-mspack.h"
#include <hlp.h> #include "hlp.h"
struct mshlp_compressor * struct mshlp_compressor *
mspack_create_hlp_compressor(struct mspack_system *sys) mspack_create_hlp_compressor(struct mspack_system *sys)

4
rbutil/rbutilqt/mspack/hlpd.c
View file

@ -9,8 +9,8 @@
/* HLP decompression implementation */ /* HLP decompression implementation */
#include <system.h> #include "system-mspack.h"
#include <hlp.h> #include "hlp.h"
struct mshlp_decompressor * struct mshlp_decompressor *
mspack_create_hlp_decompressor(struct mspack_system *sys) mspack_create_hlp_decompressor(struct mspack_system *sys)

2
rbutil/rbutilqt/mspack/kwaj.h
View file

@ -10,7 +10,7 @@
#ifndef MSPACK_KWAJ_H #ifndef MSPACK_KWAJ_H
#define MSPACK_KWAJ_H 1 #define MSPACK_KWAJ_H 1
#include <lzss.h> #include "lzss.h"
/* generic KWAJ definitions */ /* generic KWAJ definitions */
#define kwajh_Signature1 (0x00) #define kwajh_Signature1 (0x00)

4
rbutil/rbutilqt/mspack/kwajc.c
View file

@ -9,8 +9,8 @@
/* KWAJ compression implementation */ /* KWAJ compression implementation */
#include <system.h> #include "system-mspack.h"
#include <kwaj.h> #include "kwaj.h"
struct mskwaj_compressor * struct mskwaj_compressor *
mspack_create_kwaj_compressor(struct mspack_system *sys) mspack_create_kwaj_compressor(struct mspack_system *sys)

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

@ -12,8 +12,8 @@
/* KWAJ decompression implementation */ /* KWAJ decompression implementation */
#include <system.h> #include "system-mspack.h"
#include <kwaj.h> #include "kwaj.h"
/* prototypes */ /* prototypes */
static struct mskwajd_header *kwajd_open( static struct mskwajd_header *kwajd_open(
@ -361,7 +361,7 @@ static int kwajd_error(struct mskwaj_decompressor *base)
} \ } \
INJECT_BITS(*i_ptr++, 8); \ INJECT_BITS(*i_ptr++, 8); \
} while (0) } while (0)
#include <readbits.h> #include "readbits.h"
/* import huffman-reading macros and code */ /* import huffman-reading macros and code */
#define TABLEBITS(tbl) KWAJ_TABLEBITS #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_TABLE(tbl,idx) lzh->tbl##_table[idx]
#define HUFF_LEN(tbl,idx) lzh->tbl##_len[idx] #define HUFF_LEN(tbl,idx) lzh->tbl##_len[idx]
#define HUFF_ERROR return MSPACK_ERR_DATAFORMAT #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 /* 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 * ends. Depending on how many bits are left in the final byte when

6
rbutil/rbutilqt/mspack/lit.h
View file

@ -10,9 +10,9 @@
#ifndef MSPACK_LIT_H #ifndef MSPACK_LIT_H
#define MSPACK_LIT_H 1 #define MSPACK_LIT_H 1
#include <lzx.h> #include "lzx.h"
#include <des.h> #include "des.h"
#include <sha.h> #include "sha.h"
/* generic LIT definitions */ /* generic LIT definitions */

4
rbutil/rbutilqt/mspack/litc.c
View file

@ -9,8 +9,8 @@
/* LIT compression implementation */ /* LIT compression implementation */
#include <system.h> #include "system-mspack.h"
#include <lit.h> #include "lit.h"
struct mslit_compressor * struct mslit_compressor *
mspack_create_lit_compressor(struct mspack_system *sys) mspack_create_lit_compressor(struct mspack_system *sys)

4
rbutil/rbutilqt/mspack/litd.c
View file

@ -9,8 +9,8 @@
/* LIT decompression implementation */ /* LIT decompression implementation */
#include <system.h> #include "system-mspack.h"
#include <lit.h> #include "lit.h"
struct mslit_decompressor * struct mslit_decompressor *
mspack_create_lit_decompressor(struct mspack_system *sys) mspack_create_lit_decompressor(struct mspack_system *sys)

4
rbutil/rbutilqt/mspack/lzssd.c
View file

@ -11,8 +11,8 @@
* For further details, see the file COPYING.LIB distributed with libmspack * For further details, see the file COPYING.LIB distributed with libmspack
*/ */
#include <system.h> #include "system-mspack.h"
#include <lzss.h> #include "lzss.h"
#define ENSURE_BYTES do { \ #define ENSURE_BYTES do { \
if (i_ptr >= i_end) { \ if (i_ptr >= i_end) { \

4
rbutil/rbutilqt/mspack/lzxc.c
View file

@ -12,7 +12,7 @@
/* LZX compression implementation */ /* LZX compression implementation */
#include <system.h> #include "system-mspack.h"
#include <lzx.h> #include "lzx.h"
/* todo */ /* todo */

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

@ -12,8 +12,8 @@
/* LZX decompression implementation */ /* LZX decompression implementation */
#include <system.h> #include "system-mspack.h"
#include <lzx.h> #include "lzx.h"
/* Microsoft's LZX document (in cab-sdk.exe) and their implementation /* Microsoft's LZX document (in cab-sdk.exe) and their implementation
* of the com.ms.util.cab Java package do not concur. * of the com.ms.util.cab Java package do not concur.
@ -85,7 +85,7 @@
READ_IF_NEEDED; b1 = *i_ptr++; \ READ_IF_NEEDED; b1 = *i_ptr++; \
INJECT_BITS((b1 << 8) | b0, 16); \ INJECT_BITS((b1 << 8) | b0, 16); \
} while (0) } while (0)
#include <readbits.h> #include "readbits.h"
/* import huffman-reading macros and code */ /* import huffman-reading macros and code */
#define TABLEBITS(tbl) LZX_##tbl##_TABLEBITS #define TABLEBITS(tbl) LZX_##tbl##_TABLEBITS
@ -93,7 +93,7 @@
#define HUFF_TABLE(tbl,idx) lzx->tbl##_table[idx] #define HUFF_TABLE(tbl,idx) lzx->tbl##_table[idx]
#define HUFF_LEN(tbl,idx) lzx->tbl##_len[idx] #define HUFF_LEN(tbl,idx) lzx->tbl##_len[idx]
#define HUFF_ERROR return lzx->error = MSPACK_ERR_DECRUNCH #define HUFF_ERROR return lzx->error = MSPACK_ERR_DECRUNCH
#include <readhuff.h> #include "readhuff.h"
/* BUILD_TABLE(tbl) builds a huffman lookup table from code lengths */ /* BUILD_TABLE(tbl) builds a huffman lookup table from code lengths */
#define BUILD_TABLE(tbl) \ #define BUILD_TABLE(tbl) \

4
rbutil/rbutilqt/mspack/mszipc.c
View file

@ -12,7 +12,7 @@
/* MS-ZIP compression implementation */ /* MS-ZIP compression implementation */
#include <system.h> #include "system-mspack.h"
#include <mszip.h> #include "mszip.h"
/* todo */ /* todo */

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

@ -12,8 +12,8 @@
/* MS-ZIP decompression implementation. */ /* MS-ZIP decompression implementation. */
#include <system.h> #include "system-mspack.h"
#include <mszip.h> #include "mszip.h"
/* import bit-reading macros and code */ /* import bit-reading macros and code */
#define BITS_TYPE struct mszipd_stream #define BITS_TYPE struct mszipd_stream
@ -24,7 +24,7 @@
READ_IF_NEEDED; \ READ_IF_NEEDED; \
INJECT_BITS(*i_ptr++, 8); \ INJECT_BITS(*i_ptr++, 8); \
} while (0) } while (0)
#include <readbits.h> #include "readbits.h"
/* import huffman macros and code */ /* import huffman macros and code */
#define TABLEBITS(tbl) MSZIP_##tbl##_TABLEBITS #define TABLEBITS(tbl) MSZIP_##tbl##_TABLEBITS
@ -32,7 +32,7 @@
#define HUFF_TABLE(tbl,idx) zip->tbl##_table[idx] #define HUFF_TABLE(tbl,idx) zip->tbl##_table[idx]
#define HUFF_LEN(tbl,idx) zip->tbl##_len[idx] #define HUFF_LEN(tbl,idx) zip->tbl##_len[idx]
#define HUFF_ERROR return INF_ERR_HUFFSYM #define HUFF_ERROR return INF_ERR_HUFFSYM
#include <readhuff.h> #include "readhuff.h"
#define FLUSH_IF_NEEDED do { \ #define FLUSH_IF_NEEDED do { \
if (zip->window_posn == MSZIP_FRAME_SIZE) { \ if (zip->window_posn == MSZIP_FRAME_SIZE) { \

6
rbutil/rbutilqt/mspack/qtmd.c
View file

@ -20,8 +20,8 @@
* http://www.speakeasy.org/~russotto/quantumcomp.html * http://www.speakeasy.org/~russotto/quantumcomp.html
*/ */
#include <system.h> #include "system-mspack.h"
#include <qtm.h> #include "qtm.h"
/* import bit-reading macros and code */ /* import bit-reading macros and code */
#define BITS_TYPE struct qtmd_stream #define BITS_TYPE struct qtmd_stream
@ -33,7 +33,7 @@
READ_IF_NEEDED; b1 = *i_ptr++; \ READ_IF_NEEDED; b1 = *i_ptr++; \
INJECT_BITS((b0 << 8) | b1, 16); \ INJECT_BITS((b0 << 8) | b1, 16); \
} while (0) } while (0)
#include <readbits.h> #include "readbits.h"
/* Quantum static data tables: /* Quantum static data tables:
* *

2
rbutil/rbutilqt/mspack/system.c → rbutil/rbutilqt/mspack/system-mspack.c
View file

@ -11,7 +11,7 @@
# include <config.h> # include <config.h>
#endif #endif
#include <system.h> #include "system-mspack.h"
#ifndef LARGEFILE_SUPPORT #ifndef LARGEFILE_SUPPORT
const char *largefile_msg = "library not compiled to support large files."; const char *largefile_msg = "library not compiled to support large files.";

2
rbutil/rbutilqt/mspack/system.h → rbutil/rbutilqt/mspack/system-mspack.h
View file

@ -19,7 +19,7 @@ extern "C" {
# include <config.h> # include <config.h>
#endif #endif
#include <mspack.h> #include "mspack.h"
/* fix for problem with GCC 4 and glibc (thanks to Ville Skytta) /* fix for problem with GCC 4 and glibc (thanks to Ville Skytta)
* http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=150429 * http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=150429

2
rbutil/rbutilqt/mspack/szdd.h
View file

@ -10,7 +10,7 @@
#ifndef MSPACK_SZDD_H #ifndef MSPACK_SZDD_H
#define MSPACK_SZDD_H 1 #define MSPACK_SZDD_H 1
#include <lzss.h> #include "lzss.h"
/* input buffer size during decompression - not worth parameterising IMHO */ /* input buffer size during decompression - not worth parameterising IMHO */
#define SZDD_INPUT_SIZE (2048) #define SZDD_INPUT_SIZE (2048)

4
rbutil/rbutilqt/mspack/szddc.c
View file

@ -9,8 +9,8 @@
/* SZDD compression implementation */ /* SZDD compression implementation */
#include <system.h> #include "system-mspack.h"
#include <szdd.h> #include "szdd.h"
struct msszdd_compressor * struct msszdd_compressor *
mspack_create_szdd_compressor(struct mspack_system *sys) mspack_create_szdd_compressor(struct mspack_system *sys)

4
rbutil/rbutilqt/mspack/szddd.c
View file

@ -13,8 +13,8 @@
/* SZDD decompression implementation */ /* SZDD decompression implementation */
#include <system.h> #include "system-mspack.h"
#include <szdd.h> #include "szdd.h"
/* prototypes */ /* prototypes */
static struct msszddd_header *szddd_open( static struct msszddd_header *szddd_open(