summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-02-28 20:55:31 +0000
committerJens Arnold <amiconn@rockbox.org>2005-02-28 20:55:31 +0000
commitb363d656252eed5720e9f172dafa7b56ac66a994 (patch)
tree0e42dd388ea71cd83ee40b5007bb813cd1946dad
parentc080f7e19e96a88e9711417ac039f082b11f2655 (diff)
downloadrockbox-b363d656252eed5720e9f172dafa7b56ac66a994.tar.gz
rockbox-b363d656252eed5720e9f172dafa7b56ac66a994.zip
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
-rw-r--r--apps/codecs/Tremor/bitwise.c2
-rw-r--r--apps/codecs/Tremor/block.c2
-rw-r--r--apps/codecs/Tremor/codebook.c2
-rw-r--r--apps/codecs/Tremor/config-tremor.h2
-rw-r--r--apps/codecs/Tremor/floor0.c2
-rw-r--r--apps/codecs/Tremor/floor1.c2
-rw-r--r--apps/codecs/Tremor/framing.c2
-rw-r--r--apps/codecs/Tremor/info.c2
-rw-r--r--apps/codecs/Tremor/ivorbisfile_example.c2
-rw-r--r--apps/codecs/Tremor/mapping0.c2
-rw-r--r--apps/codecs/Tremor/misc.h1
-rw-r--r--apps/codecs/Tremor/res012.c2
-rw-r--r--apps/codecs/Tremor/sharedbook.c2
-rw-r--r--apps/codecs/Tremor/vorbisfile.c2
-rw-r--r--apps/codecs/Tremor/window.c2
-rw-r--r--apps/codecs/codec.h43
-rw-r--r--apps/codecs/libFLAC/bitbuffer.c2
-rw-r--r--apps/codecs/libFLAC/cpu.c2
-rw-r--r--apps/codecs/libFLAC/file_decoder.c2
-rw-r--r--apps/codecs/libFLAC/file_encoder.c2
-rw-r--r--apps/codecs/libFLAC/format.c2
-rw-r--r--apps/codecs/libFLAC/include/FLAC/callback.h2
-rw-r--r--apps/codecs/libFLAC/include/global.h3
-rw-r--r--apps/codecs/libFLAC/include/private/memory.h2
-rw-r--r--apps/codecs/libFLAC/md5.c2
-rw-r--r--apps/codecs/libFLAC/memory.c1
-rw-r--r--apps/codecs/libFLAC/metadata_iterators.c2
-rw-r--r--apps/codecs/libFLAC/metadata_object.c2
-rw-r--r--apps/codecs/libFLAC/seekable_stream_decoder.c2
-rw-r--r--apps/codecs/libFLAC/seekable_stream_encoder.c2
-rw-r--r--apps/codecs/libFLAC/stream_decoder.c2
-rw-r--r--apps/codecs/libFLAC/stream_encoder.c2
-rw-r--r--apps/codecs/liba52/config-a52.h2
-rw-r--r--apps/codecs/liba52/parse.c1
-rw-r--r--apps/codecs/libmad/decoder.c2
-rw-r--r--apps/codecs/libmad/frame.c2
-rw-r--r--apps/codecs/libmad/global.h2
-rw-r--r--apps/codecs/libmad/layer3.c1
-rw-r--r--apps/codecs/libmad/stream.c2
-rw-r--r--apps/codecs/libwavpack/unpack.c1
-rw-r--r--apps/codecs/libwavpack/wavpack.h2
-rw-r--r--apps/plugins/lib/xxx2wav.c16
-rw-r--r--apps/plugins/lib/xxx2wav.h9
43 files changed, 95 insertions, 49 deletions
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 @@
18/* We're 'LSb' endian; if we write a word but read individual bits, 18/* We're 'LSb' endian; if we write a word but read individual bits,
19 then we'll read the lsb first */ 19 then we'll read the lsb first */
20 20
21#include "config-tremor.h"
21#include <string.h> 22#include <string.h>
22#include <stdlib.h>
23#include "ogg.h" 23#include "ogg.h"
24 24
25static unsigned long mask[]= 25static 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 @@
15 15
16 ********************************************************************/ 16 ********************************************************************/
17 17
18#include "config-tremor.h"
18#include <stdio.h> 19#include <stdio.h>
19#include <stdlib.h>
20#include <string.h> 20#include <string.h>
21#include "ogg.h" 21#include "ogg.h"
22#include "ivorbiscodec.h" 22#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 @@
15 15
16 ********************************************************************/ 16 ********************************************************************/
17 17
18#include <stdlib.h> 18#include "config-tremor.h"
19#include <string.h> 19#include <string.h>
20#include <math.h> 20#include <math.h>
21#include "ogg.h" 21#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 @@
1#include "../codec.h"
2
1#define BIG_ENDIAN 1 3#define BIG_ENDIAN 1
2#define LITTLE_ENDIAN 0 4#define LITTLE_ENDIAN 0
3#define _LOW_ACCURACY_ 5#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 @@
15 15
16 ********************************************************************/ 16 ********************************************************************/
17 17
18#include <stdlib.h> 18#include "config-tremor.h"
19#include <string.h> 19#include <string.h>
20#include <math.h> 20#include <math.h>
21#include "ogg.h" 21#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 @@
15 15
16 ********************************************************************/ 16 ********************************************************************/
17 17
18#include <stdlib.h> 18#include "config-tremor.h"
19#include <string.h> 19#include <string.h>
20#include <math.h> 20#include <math.h>
21#include "ogg.h" 21#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 @@
19 19
20 ********************************************************************/ 20 ********************************************************************/
21 21
22#include <stdlib.h> 22#include "config-tremor.h"
23#include <string.h> 23#include <string.h>
24#include "ogg.h" 24#include "ogg.h"
25#include "misc.h" 25#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 @@
18/* general handling of the header and the vorbis_info structure (and 18/* general handling of the header and the vorbis_info structure (and
19 substructures) */ 19 substructures) */
20 20
21#include <stdlib.h> 21#include "config-tremor.h"
22#include <string.h> 22#include <string.h>
23#include <ctype.h> 23#include <ctype.h>
24#include "ogg.h" 24#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 @@
19 stdout using vorbisfile. Using vorbisfile is much simpler than 19 stdout using vorbisfile. Using vorbisfile is much simpler than
20 dealing with libvorbis. */ 20 dealing with libvorbis. */
21 21
22#include "config-tremor.h"
22#include <stdio.h> 23#include <stdio.h>
23#include <stdlib.h>
24#include <vorbis/ivorbiscodec.h> 24#include <vorbis/ivorbiscodec.h>
25#include <vorbis/ivorbisfile.h> 25#include <vorbis/ivorbisfile.h>
26 26
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 @@
15 15
16 ********************************************************************/ 16 ********************************************************************/
17 17
18#include <stdlib.h> 18#include "config-tremor.h"
19#include <stdio.h> 19#include <stdio.h>
20#include <string.h> 20#include <string.h>
21#include <math.h> 21#include <math.h>
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 @@
26 26
27 27
28/* Some prototypes that were not defined elsewhere */ 28/* Some prototypes that were not defined elsewhere */
29#include <stdlib.h>
30void *_vorbis_block_alloc(vorbis_block *vb,long bytes); 29void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
31void _vorbis_block_ripcord(vorbis_block *vb); 30void _vorbis_block_ripcord(vorbis_block *vb);
32extern int _ilog(unsigned int v); 31extern 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 @@
15 15
16 ********************************************************************/ 16 ********************************************************************/
17 17
18#include <stdlib.h> 18#include "config-tremor.h"
19#include <string.h> 19#include <string.h>
20#include <math.h> 20#include <math.h>
21#include "ogg.h" 21#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 @@
15 15
16 ********************************************************************/ 16 ********************************************************************/
17 17
18#include <stdlib.h> 18#include "config-tremor.h"
19#include <math.h> 19#include <math.h>
20#include <string.h> 20#include <string.h>
21#include "ogg.h" 21#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 @@
16 16
17 ********************************************************************/ 17 ********************************************************************/
18 18
19#include <stdlib.h> 19#include "config-tremor.h"
20#include <stdio.h> 20#include <stdio.h>
21#include <errno.h> 21#include <errno.h>
22#include <string.h> 22#include <string.h>
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 @@
15 15
16 ********************************************************************/ 16 ********************************************************************/
17 17
18#include <stdlib.h> 18#include "config-tremor.h"
19#include <math.h> 19#include <math.h>
20#include "os.h" 20#include "os.h"
21#include "misc.h" 21#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 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2005 Jens Arnold
11 *
12 * All files in this archive are subject to the GNU General Public License.
13 * See the file COPYING in the source tree root for full license agreement.
14 *
15 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
16 * KIND, either express or implied.
17 *
18 ****************************************************************************/
19
20/* Global declarations to be used in rockbox software codecs */
21
22#include <sys/types.h>
23
24/* Get these functions 'out of the way' of the standard functions. Not doing
25 * so confuses the cygwin linker, and maybe others. These functions need to
26 * be implemented elsewhere */
27#define malloc(x) codec_malloc(x)
28#define calloc(x,y) codec_calloc(x,y)
29#define alloca(x) codec_alloca(x)
30#define realloc(x,y) codec_realloc(x,y)
31#define free(x) codec_free(x)
32
33void* codec_malloc(size_t size);
34void* codec_calloc(size_t nmemb, size_t size);
35void* codec_alloca(size_t size);
36void* codec_realloc(void* ptr, size_t size);
37void codec_free(void* ptr);
38
39#define abs(x) ((x)>0?(x):-(x))
40#define labs(x) abs(x)
41
42void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *));
43
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 @@
29 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <stdlib.h> /* for malloc() */ 32#include "global.h" /* for malloc() */
33#include <string.h> /* for memcpy(), memset() */ 33#include <string.h> /* for memcpy(), memset() */
34#include "private/bitbuffer.h" 34#include "private/bitbuffer.h"
35#include "private/bitmath.h" 35#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 @@
30 */ 30 */
31 31
32#include "private/cpu.h" 32#include "private/cpu.h"
33#include <stdlib.h> 33#include "global.h"
34#include <stdio.h> 34#include <stdio.h>
35 35
36#ifdef HAVE_CONFIG_H 36#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 @@
30 */ 30 */
31 31
32#include <stdio.h> 32#include <stdio.h>
33#include <stdlib.h> /* for malloc() */ 33#include "global.h" /* for malloc() */
34#include <string.h> /* for strcmp() */ 34#include <string.h> /* for strcmp() */
35#include <sys/stat.h> /* for stat() */ 35#include <sys/stat.h> /* for stat() */
36#if defined _MSC_VER || defined __MINGW32__ 36#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 @@
30 */ 30 */
31 31
32#include <stdio.h> 32#include <stdio.h>
33#include <stdlib.h> /* for malloc() */ 33#include "global.h" /* for malloc() */
34#include <string.h> /* for strlen(), strcpy() */ 34#include <string.h> /* for strlen(), strcpy() */
35#include "FLAC/assert.h" 35#include "FLAC/assert.h"
36#include "protected/file_encoder.h" 36#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 @@
30 */ 30 */
31 31
32#include <stdio.h> 32#include <stdio.h>
33#include <stdlib.h> /* for qsort() */ 33#include "global.h" /* for qsort() */
34#include "FLAC/assert.h" 34#include "FLAC/assert.h"
35#include "FLAC/format.h" 35#include "FLAC/format.h"
36#include "private/format.h" 36#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 @@
33#define FLAC__CALLBACK_H 33#define FLAC__CALLBACK_H
34 34
35#include "ordinals.h" 35#include "ordinals.h"
36#include <stdlib.h> /* for size_t */ 36#include <sys/types.h> /* for size_t */
37 37
38/** \file include/FLAC/callback.h 38/** \file include/FLAC/callback.h
39 * 39 *
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 @@
1/* global include file for libFLAC/rockbox */
2
3#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 @@
36#include <config.h> 36#include <config.h>
37#endif 37#endif
38 38
39#include <stdlib.h> /* for size_t */ 39#include <sys/types.h> /* for size_t */
40 40
41#include "private/float.h" 41#include "private/float.h"
42#include "FLAC/ordinals.h" /* for FLAC__bool */ 42#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 @@
23 * Still in the public domain. 23 * Still in the public domain.
24 */ 24 */
25 25
26#include <stdlib.h> /* for malloc() */ 26#include "global.h" /* for malloc() */
27#include <string.h> /* for memcpy() */ 27#include <string.h> /* for memcpy() */
28 28
29#include "private/md5.h" 29#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 @@
29 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include "global.h" /* for malloc() */
32#include "private/memory.h" 33#include "private/memory.h"
33#include "FLAC/assert.h" 34#include "FLAC/assert.h"
34 35
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 @@
31 31
32#include <errno.h> 32#include <errno.h>
33#include <stdio.h> 33#include <stdio.h>
34#include <stdlib.h> 34#include "global.h"
35#include <string.h> 35#include <string.h>
36 36
37#if defined _MSC_VER || defined __MINGW32__ 37#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 @@
29 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <stdlib.h> 32#include "global.h"
33#include <string.h> 33#include <string.h>
34 34
35#include "private/metadata.h" 35#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 @@
30 */ 30 */
31 31
32#include <stdio.h> 32#include <stdio.h>
33#include <stdlib.h> /* for calloc() */ 33#include "global.h" /* for calloc() */
34#include <string.h> /* for memcpy()/memcmp() */ 34#include <string.h> /* for memcpy()/memcmp() */
35#include "FLAC/assert.h" 35#include "FLAC/assert.h"
36#include "protected/seekable_stream_decoder.h" 36#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 @@
30 */ 30 */
31 31
32#include <stdio.h> 32#include <stdio.h>
33#include <stdlib.h> /* for calloc() */ 33#include "global.h" /* for calloc() */
34#include <string.h> /* for memcpy() */ 34#include <string.h> /* for memcpy() */
35#include "FLAC/assert.h" 35#include "FLAC/assert.h"
36#include "protected/seekable_stream_encoder.h" 36#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 @@
30 */ 30 */
31 31
32#include <stdio.h> 32#include <stdio.h>
33#include <stdlib.h> /* for malloc() */ 33#include "global.h" /* for malloc() */
34#include <string.h> /* for memset/memcpy() */ 34#include <string.h> /* for memset/memcpy() */
35#include "FLAC/assert.h" 35#include "FLAC/assert.h"
36#include "protected/stream_decoder.h" 36#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 @@
31 31
32#include <limits.h> 32#include <limits.h>
33#include <stdio.h> 33#include <stdio.h>
34#include <stdlib.h> /* for malloc() */ 34#include "global.h" /* for malloc() */
35#include <string.h> /* for memcpy() */ 35#include <string.h> /* for memcpy() */
36#include "FLAC/assert.h" 36#include "FLAC/assert.h"
37#include "FLAC/stream_decoder.h" 37#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 @@
1#include "../codec.h"
2
1/* a52dec profiling */ 3/* a52dec profiling */
2/* #undef A52DEC_GPROF */ 4/* #undef A52DEC_GPROF */
3 5
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 @@
23 23
24#include "config-a52.h" 24#include "config-a52.h"
25 25
26#include <stdlib.h>
27#include <string.h> 26#include <string.h>
28#include <inttypes.h> 27#include <inttypes.h>
29 28
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 @@
41# include <fcntl.h> 41# include <fcntl.h>
42# endif 42# endif
43 43
44# include <stdlib.h>
45
46# ifdef HAVE_ERRNO_H 44# ifdef HAVE_ERRNO_H
47# include <errno.h> 45# include <errno.h>
48# endif 46# 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 @@
25 25
26# include "global.h" 26# include "global.h"
27 27
28# include <stdlib.h>
29
30# include "bit.h" 28# include "bit.h"
31# include "stream.h" 29# include "stream.h"
32# include "frame.h" 30# 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 @@
19 * $Id$ 19 * $Id$
20 */ 20 */
21 21
22#include "../codec.h"
23
22# ifndef LIBMAD_GLOBAL_H 24# ifndef LIBMAD_GLOBAL_H
23# define LIBMAD_GLOBAL_H 25# define LIBMAD_GLOBAL_H
24 26
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 @@
25 25
26# include "global.h" 26# include "global.h"
27 27
28# include <stdlib.h>
29# include <string.h> 28# include <string.h>
30 29
31# ifdef HAVE_ASSERT_H 30# 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 @@
25 25
26# include "global.h" 26# include "global.h"
27 27
28# include <stdlib.h>
29
30# include "bit.h" 28# include "bit.h"
31# include "stream.h" 29# include "stream.h"
32 30
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 @@
17 17
18#include <string.h> 18#include <string.h>
19#include <math.h> 19#include <math.h>
20#include <stdlib.h>
21 20
22#define LOSSY_MUTE 21#define LOSSY_MUTE
23 22
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 @@
8 8
9// wavpack.h 9// wavpack.h
10 10
11#include "../codec.h"
12
11#include <inttypes.h> 13#include <inttypes.h>
12 14
13// This header file contains all the definitions required by WavPack. 15// 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
33unsigned char* mallocbuf; // 512K from the start of MP3 buffer 33unsigned char* mallocbuf; // 512K from the start of MP3 buffer
34unsigned char* filebuf; // The rest of the MP3 buffer 34unsigned char* filebuf; // The rest of the MP3 buffer
35 35
36void* malloc(size_t size) { 36void* codec_malloc(size_t size) {
37 void* x; 37 void* x;
38 char s[32]; 38 char s[32];
39 39
@@ -46,27 +46,27 @@ void* malloc(size_t size) {
46 return(x); 46 return(x);
47} 47}
48 48
49void* calloc(size_t nmemb, size_t size) { 49void* codec_calloc(size_t nmemb, size_t size) {
50 void* x; 50 void* x;
51 x=malloc(nmemb*size); 51 x = codec_malloc(nmemb*size);
52 local_rb->memset(x,0,nmemb*size); 52 local_rb->memset(x,0,nmemb*size);
53 return(x); 53 return(x);
54} 54}
55 55
56void* alloca(size_t size) { 56void* codec_alloca(size_t size) {
57 void* x; 57 void* x;
58 x=malloc(size); 58 x = codec_malloc(size);
59 return(x); 59 return(x);
60} 60}
61 61
62void free(void* ptr) { 62void codec_free(void* ptr) {
63 (void)ptr; 63 (void)ptr;
64} 64}
65 65
66void* realloc(void* ptr, size_t size) { 66void* codec_realloc(void* ptr, size_t size) {
67 void* x; 67 void* x;
68 (void)ptr; 68 (void)ptr;
69 x=malloc(size); 69 x = codec_malloc(size);
70 return(x); 70 return(x);
71} 71}
72 72
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
42extern unsigned char* mallocbuf; // 512K from the start of MP3 buffer 42extern unsigned char* mallocbuf; // 512K from the start of MP3 buffer
43extern unsigned char* filebuf; // The rest of the MP3 buffer 43extern unsigned char* filebuf; // The rest of the MP3 buffer
44 44
45void* malloc(size_t size); 45void* codec_malloc(size_t size);
46void* calloc(size_t nmemb, size_t size); 46void* codec_calloc(size_t nmemb, size_t size);
47void free(void* ptr); 47void* codec_alloca(size_t size);
48void* realloc(void* ptr, size_t size); 48void* codec_realloc(void* ptr, size_t size);
49void codec_free(void* ptr);
49void *memcpy(void *dest, const void *src, size_t n); 50void *memcpy(void *dest, const void *src, size_t n);
50void *memset(void *s, int c, size_t n); 51void *memset(void *s, int c, size_t n);
51int memcmp(const void *s1, const void *s2, size_t n); 52int memcmp(const void *s1, const void *s2, size_t n);