From b363d656252eed5720e9f172dafa7b56ac66a994 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 28 Feb 2005 20:55:31 +0000 Subject: Get malloc() and friends out of the way for the cygwin linker (and maybe others), to make plugins work properly in the simulator. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6086 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/Tremor/bitwise.c | 2 +- apps/codecs/Tremor/block.c | 2 +- apps/codecs/Tremor/codebook.c | 2 +- apps/codecs/Tremor/config-tremor.h | 2 ++ apps/codecs/Tremor/floor0.c | 2 +- apps/codecs/Tremor/floor1.c | 2 +- apps/codecs/Tremor/framing.c | 2 +- apps/codecs/Tremor/info.c | 2 +- apps/codecs/Tremor/ivorbisfile_example.c | 2 +- apps/codecs/Tremor/mapping0.c | 2 +- apps/codecs/Tremor/misc.h | 1 - apps/codecs/Tremor/res012.c | 2 +- apps/codecs/Tremor/sharedbook.c | 2 +- apps/codecs/Tremor/vorbisfile.c | 2 +- apps/codecs/Tremor/window.c | 2 +- apps/codecs/codec.h | 43 +++++++++++++++++++++++++++ apps/codecs/libFLAC/bitbuffer.c | 2 +- apps/codecs/libFLAC/cpu.c | 2 +- apps/codecs/libFLAC/file_decoder.c | 2 +- apps/codecs/libFLAC/file_encoder.c | 2 +- apps/codecs/libFLAC/format.c | 2 +- apps/codecs/libFLAC/include/FLAC/callback.h | 2 +- apps/codecs/libFLAC/include/global.h | 3 ++ apps/codecs/libFLAC/include/private/memory.h | 2 +- apps/codecs/libFLAC/md5.c | 2 +- apps/codecs/libFLAC/memory.c | 1 + apps/codecs/libFLAC/metadata_iterators.c | 2 +- apps/codecs/libFLAC/metadata_object.c | 2 +- apps/codecs/libFLAC/seekable_stream_decoder.c | 2 +- apps/codecs/libFLAC/seekable_stream_encoder.c | 2 +- apps/codecs/libFLAC/stream_decoder.c | 2 +- apps/codecs/libFLAC/stream_encoder.c | 2 +- apps/codecs/liba52/config-a52.h | 2 ++ apps/codecs/liba52/parse.c | 1 - apps/codecs/libmad/decoder.c | 2 -- apps/codecs/libmad/frame.c | 2 -- apps/codecs/libmad/global.h | 2 ++ apps/codecs/libmad/layer3.c | 1 - apps/codecs/libmad/stream.c | 2 -- apps/codecs/libwavpack/unpack.c | 1 - apps/codecs/libwavpack/wavpack.h | 2 ++ apps/plugins/lib/xxx2wav.c | 16 +++++----- apps/plugins/lib/xxx2wav.h | 9 +++--- 43 files changed, 95 insertions(+), 49 deletions(-) create mode 100644 apps/codecs/codec.h create mode 100644 apps/codecs/libFLAC/include/global.h diff --git a/apps/codecs/Tremor/bitwise.c b/apps/codecs/Tremor/bitwise.c index 6215b0f5ac..b75ac408b8 100644 --- a/apps/codecs/Tremor/bitwise.c +++ b/apps/codecs/Tremor/bitwise.c @@ -18,8 +18,8 @@ /* We're 'LSb' endian; if we write a word but read individual bits, then we'll read the lsb first */ +#include "config-tremor.h" #include -#include #include "ogg.h" static unsigned long mask[]= diff --git a/apps/codecs/Tremor/block.c b/apps/codecs/Tremor/block.c index 8949253a16..a4571c37d4 100644 --- a/apps/codecs/Tremor/block.c +++ b/apps/codecs/Tremor/block.c @@ -15,8 +15,8 @@ ********************************************************************/ +#include "config-tremor.h" #include -#include #include #include "ogg.h" #include "ivorbiscodec.h" diff --git a/apps/codecs/Tremor/codebook.c b/apps/codecs/Tremor/codebook.c index 5da8957232..bb99487feb 100644 --- a/apps/codecs/Tremor/codebook.c +++ b/apps/codecs/Tremor/codebook.c @@ -15,7 +15,7 @@ ********************************************************************/ -#include +#include "config-tremor.h" #include #include #include "ogg.h" diff --git a/apps/codecs/Tremor/config-tremor.h b/apps/codecs/Tremor/config-tremor.h index a456fc208c..e53c04898c 100644 --- a/apps/codecs/Tremor/config-tremor.h +++ b/apps/codecs/Tremor/config-tremor.h @@ -1,3 +1,5 @@ +#include "../codec.h" + #define BIG_ENDIAN 1 #define LITTLE_ENDIAN 0 #define _LOW_ACCURACY_ diff --git a/apps/codecs/Tremor/floor0.c b/apps/codecs/Tremor/floor0.c index 4ba232edd8..c4f8c1c85b 100644 --- a/apps/codecs/Tremor/floor0.c +++ b/apps/codecs/Tremor/floor0.c @@ -15,7 +15,7 @@ ********************************************************************/ -#include +#include "config-tremor.h" #include #include #include "ogg.h" diff --git a/apps/codecs/Tremor/floor1.c b/apps/codecs/Tremor/floor1.c index fecdc8770c..9bfec7e803 100644 --- a/apps/codecs/Tremor/floor1.c +++ b/apps/codecs/Tremor/floor1.c @@ -15,7 +15,7 @@ ********************************************************************/ -#include +#include "config-tremor.h" #include #include #include "ogg.h" diff --git a/apps/codecs/Tremor/framing.c b/apps/codecs/Tremor/framing.c index 48ea6c1943..419c7dc8a3 100644 --- a/apps/codecs/Tremor/framing.c +++ b/apps/codecs/Tremor/framing.c @@ -19,7 +19,7 @@ ********************************************************************/ -#include +#include "config-tremor.h" #include #include "ogg.h" #include "misc.h" diff --git a/apps/codecs/Tremor/info.c b/apps/codecs/Tremor/info.c index 941695ea8e..e750c8b647 100644 --- a/apps/codecs/Tremor/info.c +++ b/apps/codecs/Tremor/info.c @@ -18,7 +18,7 @@ /* general handling of the header and the vorbis_info structure (and substructures) */ -#include +#include "config-tremor.h" #include #include #include "ogg.h" diff --git a/apps/codecs/Tremor/ivorbisfile_example.c b/apps/codecs/Tremor/ivorbisfile_example.c index 1854fc465a..3c34b25f79 100644 --- a/apps/codecs/Tremor/ivorbisfile_example.c +++ b/apps/codecs/Tremor/ivorbisfile_example.c @@ -19,8 +19,8 @@ stdout using vorbisfile. Using vorbisfile is much simpler than dealing with libvorbis. */ +#include "config-tremor.h" #include -#include #include #include diff --git a/apps/codecs/Tremor/mapping0.c b/apps/codecs/Tremor/mapping0.c index c54c896a99..d4ab3a6a29 100644 --- a/apps/codecs/Tremor/mapping0.c +++ b/apps/codecs/Tremor/mapping0.c @@ -15,7 +15,7 @@ ********************************************************************/ -#include +#include "config-tremor.h" #include #include #include diff --git a/apps/codecs/Tremor/misc.h b/apps/codecs/Tremor/misc.h index b56f65d6e8..ed7617d0e0 100644 --- a/apps/codecs/Tremor/misc.h +++ b/apps/codecs/Tremor/misc.h @@ -26,7 +26,6 @@ /* Some prototypes that were not defined elsewhere */ -#include void *_vorbis_block_alloc(vorbis_block *vb,long bytes); void _vorbis_block_ripcord(vorbis_block *vb); extern int _ilog(unsigned int v); diff --git a/apps/codecs/Tremor/res012.c b/apps/codecs/Tremor/res012.c index 56e98f3c70..1ead185d8f 100644 --- a/apps/codecs/Tremor/res012.c +++ b/apps/codecs/Tremor/res012.c @@ -15,7 +15,7 @@ ********************************************************************/ -#include +#include "config-tremor.h" #include #include #include "ogg.h" diff --git a/apps/codecs/Tremor/sharedbook.c b/apps/codecs/Tremor/sharedbook.c index a62211eed6..aae61bfb56 100644 --- a/apps/codecs/Tremor/sharedbook.c +++ b/apps/codecs/Tremor/sharedbook.c @@ -15,7 +15,7 @@ ********************************************************************/ -#include +#include "config-tremor.h" #include #include #include "ogg.h" diff --git a/apps/codecs/Tremor/vorbisfile.c b/apps/codecs/Tremor/vorbisfile.c index 7b9913b881..d9eeed3945 100644 --- a/apps/codecs/Tremor/vorbisfile.c +++ b/apps/codecs/Tremor/vorbisfile.c @@ -16,7 +16,7 @@ ********************************************************************/ -#include +#include "config-tremor.h" #include #include #include diff --git a/apps/codecs/Tremor/window.c b/apps/codecs/Tremor/window.c index 4d6e79e81d..b50e36f413 100644 --- a/apps/codecs/Tremor/window.c +++ b/apps/codecs/Tremor/window.c @@ -15,7 +15,7 @@ ********************************************************************/ -#include +#include "config-tremor.h" #include #include "os.h" #include "misc.h" diff --git a/apps/codecs/codec.h b/apps/codecs/codec.h new file mode 100644 index 0000000000..6bd1020e09 --- /dev/null +++ b/apps/codecs/codec.h @@ -0,0 +1,43 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2005 Jens Arnold + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +/* Global declarations to be used in rockbox software codecs */ + +#include + +/* Get these functions 'out of the way' of the standard functions. Not doing + * so confuses the cygwin linker, and maybe others. These functions need to + * be implemented elsewhere */ +#define malloc(x) codec_malloc(x) +#define calloc(x,y) codec_calloc(x,y) +#define alloca(x) codec_alloca(x) +#define realloc(x,y) codec_realloc(x,y) +#define free(x) codec_free(x) + +void* codec_malloc(size_t size); +void* codec_calloc(size_t nmemb, size_t size); +void* codec_alloca(size_t size); +void* codec_realloc(void* ptr, size_t size); +void codec_free(void* ptr); + +#define abs(x) ((x)>0?(x):-(x)) +#define labs(x) abs(x) + +void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *)); + diff --git a/apps/codecs/libFLAC/bitbuffer.c b/apps/codecs/libFLAC/bitbuffer.c index 552a326ec2..fa9786e1f5 100644 --- a/apps/codecs/libFLAC/bitbuffer.c +++ b/apps/codecs/libFLAC/bitbuffer.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* for malloc() */ +#include "global.h" /* for malloc() */ #include /* for memcpy(), memset() */ #include "private/bitbuffer.h" #include "private/bitmath.h" diff --git a/apps/codecs/libFLAC/cpu.c b/apps/codecs/libFLAC/cpu.c index 1e6b27994f..54101e4a63 100644 --- a/apps/codecs/libFLAC/cpu.c +++ b/apps/codecs/libFLAC/cpu.c @@ -30,7 +30,7 @@ */ #include "private/cpu.h" -#include +#include "global.h" #include #ifdef HAVE_CONFIG_H diff --git a/apps/codecs/libFLAC/file_decoder.c b/apps/codecs/libFLAC/file_decoder.c index 29d489587a..f0a3ea170e 100644 --- a/apps/codecs/libFLAC/file_decoder.c +++ b/apps/codecs/libFLAC/file_decoder.c @@ -30,7 +30,7 @@ */ #include -#include /* for malloc() */ +#include "global.h" /* for malloc() */ #include /* for strcmp() */ #include /* for stat() */ #if defined _MSC_VER || defined __MINGW32__ diff --git a/apps/codecs/libFLAC/file_encoder.c b/apps/codecs/libFLAC/file_encoder.c index db4c421f98..5af8471fc0 100644 --- a/apps/codecs/libFLAC/file_encoder.c +++ b/apps/codecs/libFLAC/file_encoder.c @@ -30,7 +30,7 @@ */ #include -#include /* for malloc() */ +#include "global.h" /* for malloc() */ #include /* for strlen(), strcpy() */ #include "FLAC/assert.h" #include "protected/file_encoder.h" diff --git a/apps/codecs/libFLAC/format.c b/apps/codecs/libFLAC/format.c index 25ec7d98b6..ebc3fb2240 100644 --- a/apps/codecs/libFLAC/format.c +++ b/apps/codecs/libFLAC/format.c @@ -30,7 +30,7 @@ */ #include -#include /* for qsort() */ +#include "global.h" /* for qsort() */ #include "FLAC/assert.h" #include "FLAC/format.h" #include "private/format.h" diff --git a/apps/codecs/libFLAC/include/FLAC/callback.h b/apps/codecs/libFLAC/include/FLAC/callback.h index c6f94c0cf4..5c23d04856 100644 --- a/apps/codecs/libFLAC/include/FLAC/callback.h +++ b/apps/codecs/libFLAC/include/FLAC/callback.h @@ -33,7 +33,7 @@ #define FLAC__CALLBACK_H #include "ordinals.h" -#include /* for size_t */ +#include /* for size_t */ /** \file include/FLAC/callback.h * diff --git a/apps/codecs/libFLAC/include/global.h b/apps/codecs/libFLAC/include/global.h new file mode 100644 index 0000000000..64c1a32e60 --- /dev/null +++ b/apps/codecs/libFLAC/include/global.h @@ -0,0 +1,3 @@ +/* global include file for libFLAC/rockbox */ + +#include "../../codec.h" diff --git a/apps/codecs/libFLAC/include/private/memory.h b/apps/codecs/libFLAC/include/private/memory.h index fca808155b..fc6b7aeb35 100644 --- a/apps/codecs/libFLAC/include/private/memory.h +++ b/apps/codecs/libFLAC/include/private/memory.h @@ -36,7 +36,7 @@ #include #endif -#include /* for size_t */ +#include /* for size_t */ #include "private/float.h" #include "FLAC/ordinals.h" /* for FLAC__bool */ diff --git a/apps/codecs/libFLAC/md5.c b/apps/codecs/libFLAC/md5.c index 9679387db9..a9154e0980 100644 --- a/apps/codecs/libFLAC/md5.c +++ b/apps/codecs/libFLAC/md5.c @@ -23,7 +23,7 @@ * Still in the public domain. */ -#include /* for malloc() */ +#include "global.h" /* for malloc() */ #include /* for memcpy() */ #include "private/md5.h" diff --git a/apps/codecs/libFLAC/memory.c b/apps/codecs/libFLAC/memory.c index 9718b261b8..d93ace693e 100644 --- a/apps/codecs/libFLAC/memory.c +++ b/apps/codecs/libFLAC/memory.c @@ -29,6 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "global.h" /* for malloc() */ #include "private/memory.h" #include "FLAC/assert.h" diff --git a/apps/codecs/libFLAC/metadata_iterators.c b/apps/codecs/libFLAC/metadata_iterators.c index 2d50dd2bdb..880f66c06c 100644 --- a/apps/codecs/libFLAC/metadata_iterators.c +++ b/apps/codecs/libFLAC/metadata_iterators.c @@ -31,7 +31,7 @@ #include #include -#include +#include "global.h" #include #if defined _MSC_VER || defined __MINGW32__ diff --git a/apps/codecs/libFLAC/metadata_object.c b/apps/codecs/libFLAC/metadata_object.c index 290036ce26..51663c0ab4 100644 --- a/apps/codecs/libFLAC/metadata_object.c +++ b/apps/codecs/libFLAC/metadata_object.c @@ -29,7 +29,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include "global.h" #include #include "private/metadata.h" diff --git a/apps/codecs/libFLAC/seekable_stream_decoder.c b/apps/codecs/libFLAC/seekable_stream_decoder.c index 53026068ff..7aa215bed5 100644 --- a/apps/codecs/libFLAC/seekable_stream_decoder.c +++ b/apps/codecs/libFLAC/seekable_stream_decoder.c @@ -30,7 +30,7 @@ */ #include -#include /* for calloc() */ +#include "global.h" /* for calloc() */ #include /* for memcpy()/memcmp() */ #include "FLAC/assert.h" #include "protected/seekable_stream_decoder.h" diff --git a/apps/codecs/libFLAC/seekable_stream_encoder.c b/apps/codecs/libFLAC/seekable_stream_encoder.c index 18291a8052..ba4326bdc9 100644 --- a/apps/codecs/libFLAC/seekable_stream_encoder.c +++ b/apps/codecs/libFLAC/seekable_stream_encoder.c @@ -30,7 +30,7 @@ */ #include -#include /* for calloc() */ +#include "global.h" /* for calloc() */ #include /* for memcpy() */ #include "FLAC/assert.h" #include "protected/seekable_stream_encoder.h" diff --git a/apps/codecs/libFLAC/stream_decoder.c b/apps/codecs/libFLAC/stream_decoder.c index 16413140ce..cbf57a199e 100644 --- a/apps/codecs/libFLAC/stream_decoder.c +++ b/apps/codecs/libFLAC/stream_decoder.c @@ -30,7 +30,7 @@ */ #include -#include /* for malloc() */ +#include "global.h" /* for malloc() */ #include /* for memset/memcpy() */ #include "FLAC/assert.h" #include "protected/stream_decoder.h" diff --git a/apps/codecs/libFLAC/stream_encoder.c b/apps/codecs/libFLAC/stream_encoder.c index 33debfc06a..14f0815b8a 100644 --- a/apps/codecs/libFLAC/stream_encoder.c +++ b/apps/codecs/libFLAC/stream_encoder.c @@ -31,7 +31,7 @@ #include #include -#include /* for malloc() */ +#include "global.h" /* for malloc() */ #include /* for memcpy() */ #include "FLAC/assert.h" #include "FLAC/stream_decoder.h" diff --git a/apps/codecs/liba52/config-a52.h b/apps/codecs/liba52/config-a52.h index d8aa77dfae..1aec4cda14 100644 --- a/apps/codecs/liba52/config-a52.h +++ b/apps/codecs/liba52/config-a52.h @@ -1,3 +1,5 @@ +#include "../codec.h" + /* a52dec profiling */ /* #undef A52DEC_GPROF */ diff --git a/apps/codecs/liba52/parse.c b/apps/codecs/liba52/parse.c index 4846c985ba..9575397a95 100644 --- a/apps/codecs/liba52/parse.c +++ b/apps/codecs/liba52/parse.c @@ -23,7 +23,6 @@ #include "config-a52.h" -#include #include #include diff --git a/apps/codecs/libmad/decoder.c b/apps/codecs/libmad/decoder.c index f484e36569..fcbabce923 100644 --- a/apps/codecs/libmad/decoder.c +++ b/apps/codecs/libmad/decoder.c @@ -41,8 +41,6 @@ # include # endif -# include - # ifdef HAVE_ERRNO_H # include # endif diff --git a/apps/codecs/libmad/frame.c b/apps/codecs/libmad/frame.c index 9a6dca0f0f..91cf2f9a15 100644 --- a/apps/codecs/libmad/frame.c +++ b/apps/codecs/libmad/frame.c @@ -25,8 +25,6 @@ # include "global.h" -# include - # include "bit.h" # include "stream.h" # include "frame.h" diff --git a/apps/codecs/libmad/global.h b/apps/codecs/libmad/global.h index a3417b461a..8669bf9044 100644 --- a/apps/codecs/libmad/global.h +++ b/apps/codecs/libmad/global.h @@ -19,6 +19,8 @@ * $Id$ */ +#include "../codec.h" + # ifndef LIBMAD_GLOBAL_H # define LIBMAD_GLOBAL_H diff --git a/apps/codecs/libmad/layer3.c b/apps/codecs/libmad/layer3.c index df1084eb92..b1a9919af0 100644 --- a/apps/codecs/libmad/layer3.c +++ b/apps/codecs/libmad/layer3.c @@ -25,7 +25,6 @@ # include "global.h" -# include # include # ifdef HAVE_ASSERT_H diff --git a/apps/codecs/libmad/stream.c b/apps/codecs/libmad/stream.c index 040f1cfb8c..69c963bb0d 100644 --- a/apps/codecs/libmad/stream.c +++ b/apps/codecs/libmad/stream.c @@ -25,8 +25,6 @@ # include "global.h" -# include - # include "bit.h" # include "stream.h" diff --git a/apps/codecs/libwavpack/unpack.c b/apps/codecs/libwavpack/unpack.c index b9e53203b5..cc31b8808e 100644 --- a/apps/codecs/libwavpack/unpack.c +++ b/apps/codecs/libwavpack/unpack.c @@ -17,7 +17,6 @@ #include #include -#include #define LOSSY_MUTE diff --git a/apps/codecs/libwavpack/wavpack.h b/apps/codecs/libwavpack/wavpack.h index 98dba8631b..6f74d95749 100644 --- a/apps/codecs/libwavpack/wavpack.h +++ b/apps/codecs/libwavpack/wavpack.h @@ -8,6 +8,8 @@ // wavpack.h +#include "../codec.h" + #include // This header file contains all the definitions required by WavPack. diff --git a/apps/plugins/lib/xxx2wav.c b/apps/plugins/lib/xxx2wav.c index 3f8853ffbf..3f9fab062b 100644 --- a/apps/plugins/lib/xxx2wav.c +++ b/apps/plugins/lib/xxx2wav.c @@ -33,7 +33,7 @@ unsigned char* mp3buf; // The actual MP3 buffer from Rockbox unsigned char* mallocbuf; // 512K from the start of MP3 buffer unsigned char* filebuf; // The rest of the MP3 buffer -void* malloc(size_t size) { +void* codec_malloc(size_t size) { void* x; char s[32]; @@ -46,27 +46,27 @@ void* malloc(size_t size) { return(x); } -void* calloc(size_t nmemb, size_t size) { +void* codec_calloc(size_t nmemb, size_t size) { void* x; - x=malloc(nmemb*size); + x = codec_malloc(nmemb*size); local_rb->memset(x,0,nmemb*size); return(x); } -void* alloca(size_t size) { +void* codec_alloca(size_t size) { void* x; - x=malloc(size); + x = codec_malloc(size); return(x); } -void free(void* ptr) { +void codec_free(void* ptr) { (void)ptr; } -void* realloc(void* ptr, size_t size) { +void* codec_realloc(void* ptr, size_t size) { void* x; (void)ptr; - x=malloc(size); + x = codec_malloc(size); return(x); } diff --git a/apps/plugins/lib/xxx2wav.h b/apps/plugins/lib/xxx2wav.h index e89361c46a..2806eabf27 100644 --- a/apps/plugins/lib/xxx2wav.h +++ b/apps/plugins/lib/xxx2wav.h @@ -42,10 +42,11 @@ extern unsigned char* mp3buf; // The actual MP3 buffer from Rockbox extern unsigned char* mallocbuf; // 512K from the start of MP3 buffer extern unsigned char* filebuf; // The rest of the MP3 buffer -void* malloc(size_t size); -void* calloc(size_t nmemb, size_t size); -void free(void* ptr); -void* realloc(void* ptr, size_t size); +void* codec_malloc(size_t size); +void* codec_calloc(size_t nmemb, size_t size); +void* codec_alloca(size_t size); +void* codec_realloc(void* ptr, size_t size); +void codec_free(void* ptr); void *memcpy(void *dest, const void *src, size_t n); void *memset(void *s, int c, size_t n); int memcmp(const void *s1, const void *s2, size_t n); -- cgit v1.2.3