From 27269b5ac04a2a7cb32a11c79e9d3d2825346b35 Mon Sep 17 00:00:00 2001 From: neil Date: Mon, 15 Sep 2014 16:00:43 +0000 Subject: [PATCH] Converted bz2_au.library into the OS3, OS4 and MorphOS-compatible bz2.library. All the same functions that bz2_au had are still present, but the LVO order has changed. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49634 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- external/bz2/bz2.conf | 53 ++++++++++++++++++++++++++++++++++++++++++++++ external/bz2/bz2_au.conf | 35 ------------------------------ external/bz2/mmakefile.src | 3 +-- 3 files changed, 54 insertions(+), 37 deletions(-) create mode 100644 external/bz2/bz2.conf delete mode 100644 external/bz2/bz2_au.conf diff --git a/external/bz2/bz2.conf b/external/bz2/bz2.conf new file mode 100644 index 0000000000..038c1d8f5b --- /dev/null +++ b/external/bz2/bz2.conf @@ -0,0 +1,53 @@ +##begin config +basename BZ2 +version 2.1 +date 15.9.2014 +copyright Copyright (C) 1996-2010 Julian R Seward, 2012-2014 The AROS Development Team +options pertaskbase +rellib posixc +rellib stdc +forcebase PosixCBase +##end config + +##begin cdef +#include +#include /* For FILE */ +##end cdef + +##begin cfunctionlist +const char *BZ2_bzlibVersion() () +int BZ2_bzCompressInit(bz_stream *strm, int blockSize100k, int verbosity, int workFactor) (A0,D0,D1,D2) +int BZ2_bzCompress(bz_stream *strm, int action) (A0,D0) +int BZ2_bzCompressEnd(bz_stream *strm) (A0) +int BZ2_bzDecompressInit(bz_stream *strm, int verbosity, int small) (A0,D0,D1) +int BZ2_bzDecompress(bz_stream *strm) (A0) +int BZ2_bzDecompressEnd(bz_stream *strm) (A0) +int BZ2_bzBuffToBuffCompress(char *dest, unsigned int *destLen, char *source, unsigned int sourceLen, int blockSize100k, int verbosity, int workFactor) (A0,A1,A2,D0,D1,D2,D3) +int BZ2_bzBuffToBuffDecompress(char *dest, unsigned int *destLen, char *source, unsigned int sourceLen, int small, int verbosity) (A0,A1,A2,D0,D1,D2) +int BZ2_bzCompressInit_SYSV(bz_stream *strm, int blockSize100k, int verbosity, int workFactor) +.function BZ2_bzCompressInit +int BZ2_bzCompress_SYSV(bz_stream *strm, int action) +.function BZ2_bzCompress +int BZ2_bzCompressEnd_SYSV(bz_stream *strm) +.function BZ2_bzCompressEnd +int BZ2_bzDecompressInit_SYSV(bz_stream *strm, int verbosity, int small) +.function BZ2_bzDecompressInit +int BZ2_bzDecompress_SYSV(bz_stream *strm) +.function BZ2_bzDecompress +int BZ2_bzDecompressEnd_SYSV(bz_stream *strm) +.function BZ2_bzDecompressEnd +.skip 4 +int BZ2_bzBuffToBuffCompress_SYSV(char *dest, unsigned int *destLen, char *source, unsigned int sourceLen, int blockSize100k, int verbosity, int workFactor) +.function BZ2_bzBuffToBuffCompress +int BZ2_bzBuffToBuffDecompress_SYSV(char *dest, unsigned int *destLen, char *source, unsigned int sourceLen, int small, int verbosity) +.function BZ2_bzBuffToBuffDecompress +.skip 4 +BZFILE *BZ2_bzReadOpen(int* bzerror, FILE* f, int verbosity, int small, void *unused, int nUnused) (A0,A1,D0,D1,A2,D2) +void BZ2_bzReadClose(int *bzerror, BZFILE* b) (A0,A1) +void BZ2_bzReadGetUnused(int *bzerror, BZFILE *b, void **unused, int *nUnused) (A0,A1,A2,A3) +int BZ2_bzRead(int *bzerror, BZFILE* b, void *buf, int len) (A0,A1,A2,D0) +BZFILE *BZ2_bzWriteOpen(int *bzerror, FILE *f, int blockSize100k, int verbosity, int workFactor) (A0,A1,D0,D1,D2) +void BZ2_bzWrite(int *bzerror, BZFILE* b, void *buf, int len) (A0,A1,A2,D0) +void BZ2_bzWriteClose(int *bzerror, BZFILE *b, int abandon, unsigned int *nbytes_in, unsigned int *nbytes_out) (A0,A1,D0,A2,A3) +void BZ2_bzWriteClose64(int *bzerror, BZFILE *b, int abandon, unsigned int *nbytes_in_lo32, unsigned int * nbytes_in_hi32, unsigned int *nbytes_out_lo32, unsigned int *nbytes_out_hi32) (A0,A1,D0,A2,A3,A4,D1) +##end cfunctionlist diff --git a/external/bz2/bz2_au.conf b/external/bz2/bz2_au.conf deleted file mode 100644 index e45fad2136..0000000000 --- a/external/bz2/bz2_au.conf +++ /dev/null @@ -1,35 +0,0 @@ -##begin config -basename BZ2 -version 3.0 -date 16.05.2012 -copyright Copyright (C) 1996-2010 Julian R Seward, 2012 The AROS Development Team -options pertaskbase -rellib posixc -rellib stdc -forcebase PosixCBase -##end config - -##begin cdef -#include -#include /* For FILE */ -##end cdef - -##begin functionlist -const char *BZ2_bzlibVersion() -int BZ2_bzCompressInit(bz_stream *strm, int blockSize100k, int verbosity, int workFactor) -int BZ2_bzCompress(bz_stream *strm, int action) -int BZ2_bzCompressEnd(bz_stream *strm) -int BZ2_bzDecompressInit(bz_stream *strm, int verbosity, int small) -int BZ2_bzDecompress(bz_stream *strm) -int BZ2_bzDecompressEnd(bz_stream *strm) -int BZ2_bzBuffToBuffCompress(char *dest, unsigned int *destLen, char *source, unsigned int sourceLen, int blockSize100k, int verbosity, int workFactor) -int BZ2_bzBuffToBuffDecompress(char *dest, unsigned int *destLen, char *source, unsigned int sourceLen, int small, int verbosity) -BZFILE *BZ2_bzReadOpen(int* bzerror, FILE* f, int verbosity, int small, void *unused, int nUnused) -void BZ2_bzReadClose(int *bzerror, BZFILE* b) -void BZ2_bzReadGetUnused(int *bzerror, BZFILE *b, void **unused, int *nUnused) -int BZ2_bzRead(int *bzerror, BZFILE* b, void *buf, int len) -BZFILE *BZ2_bzWriteOpen(int *bzerror, FILE *f, int blockSize100k, int verbosity, int workFactor) -void BZ2_bzWrite(int *bzerror, BZFILE* b, void *buf, int len) -void BZ2_bzWriteClose(int *bzerror, BZFILE *b, int abandon, unsigned int *nbytes_in, unsigned int *nbytes_out) -void BZ2_bzWriteClose64(int *bzerror, BZFILE *b, int abandon, unsigned int *nbytes_in_lo32, unsigned int * nbytes_in_hi32, unsigned int *nbytes_out_lo32, unsigned int *nbytes_out_hi32) -##end functionlist diff --git a/external/bz2/mmakefile.src b/external/bz2/mmakefile.src index 04dbd26e23..0611ec7b7e 100644 --- a/external/bz2/mmakefile.src +++ b/external/bz2/mmakefile.src @@ -14,8 +14,7 @@ FILES := blocksort huffman crctable randtable \ compress decompress bzlib %build_module mmake=external-bz2-lib \ - modname=bz2_au modtype=library \ - files="$(FILES)" linklibname="bz2" + modname=bz2 modtype=library files="$(FILES)" ################################################################################### -- 2.11.4.GIT