From 37011258d6b0bfc28f75473505160e8b2b71fdd2 Mon Sep 17 00:00:00 2001
From: Magnus Holmgren <magnushol@gmail.com>
Date: Mon, 17 Oct 2005 18:46:46 +0000
Subject: iriver: more codec library cleanup: remove codec_alloca and a some
 extraneous defines.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7637 a1c6a512-1295-4272-9138-f99709370657
---
 apps/codecs/Tremor/misc.h  |  1 -
 apps/codecs/codec.h        |  8 +-------
 apps/codecs/lib/codeclib.c |  9 ---------
 apps/codecs/lib/codeclib.h | 15 ---------------
 4 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/apps/codecs/Tremor/misc.h b/apps/codecs/Tremor/misc.h
index feaa21f9ae..81903e1b95 100644
--- a/apps/codecs/Tremor/misc.h
+++ b/apps/codecs/Tremor/misc.h
@@ -30,7 +30,6 @@
 void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
 void _vorbis_block_ripcord(vorbis_block *vb);
 extern int _ilog(unsigned int v);
-void* alloca(size_t size);
 
 #ifndef _V_WIDE_MATH
 #define _V_WIDE_MATH
diff --git a/apps/codecs/codec.h b/apps/codecs/codec.h
index f954d1bc4d..daa7c19cd7 100644
--- a/apps/codecs/codec.h
+++ b/apps/codecs/codec.h
@@ -31,19 +31,13 @@
 #define calloc(x,y) codec_calloc(x,y)
 #define realloc(x,y) codec_realloc(x,y)
 #define free(x) codec_free(x)
+#define alloca(x) __builtin_alloca(x)
 
 void* codec_malloc(size_t size);
 void* codec_calloc(size_t nmemb, size_t size);
 void* codec_realloc(void* ptr, size_t size);
 void codec_free(void* ptr);
 
-#if !defined(SIMULATOR)
-#define alloca __builtin_alloca
-#else
-#define alloca(x) codec_alloca(x)
-void* codec_alloca(size_t size);
-#endif
-
 #define abs(x) ((x)>0?(x):-(x))
 #define labs(x) abs(x)
 
diff --git a/apps/codecs/lib/codeclib.c b/apps/codecs/lib/codeclib.c
index b9858dd412..482c5a5af1 100644
--- a/apps/codecs/lib/codeclib.c
+++ b/apps/codecs/lib/codeclib.c
@@ -75,15 +75,6 @@ void* codec_calloc(size_t nmemb, size_t size)
     return(x);
 }
 
-#if defined(SIMULATOR)
-void* codec_alloca(size_t size)
-{
-    void* x;
-    x = codec_malloc(size);
-    return(x);
-}
-#endif
-
 void codec_free(void* ptr) {
     (void)ptr;
 }
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h
index b46b44bbce..8852b47043 100644
--- a/apps/codecs/lib/codeclib.h
+++ b/apps/codecs/lib/codeclib.h
@@ -32,26 +32,11 @@ extern unsigned char* filebuf;    // The rest of the MP3 buffer
 
 /* Standard library functions that are used by the codecs follow here */
 
-/* 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 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_realloc(void* ptr, size_t size);
 void codec_free(void* ptr);
 
-#if !defined(SIMULATOR)
-#define alloca __builtin_alloca
-#else
-#define alloca(x) codec_alloca(x)
-void* codec_alloca(size_t size);
-#endif
-
 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