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

@@ -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 <string.h>
-#include <stdlib.h>
 #include "ogg.h"
 
 static unsigned long mask[]=

apps/codecs/Tremor/block.c

@@ -15,8 +15,8 @@
 
  ********************************************************************/
 
+#include "config-tremor.h"
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include "ogg.h"
 #include "ivorbiscodec.h"

apps/codecs/Tremor/codebook.c

@@ -15,7 +15,7 @@
 
  ********************************************************************/
 
-#include <stdlib.h>
+#include "config-tremor.h"
 #include <string.h>
 #include <math.h>
 #include "ogg.h"

apps/codecs/Tremor/config-tremor.h

@@ -1,3 +1,5 @@
+#include "../codec.h"
+
 #define BIG_ENDIAN 1
 #define LITTLE_ENDIAN 0
 #define _LOW_ACCURACY_

apps/codecs/Tremor/floor0.c

@@ -15,7 +15,7 @@
 
  ********************************************************************/
 
-#include <stdlib.h>
+#include "config-tremor.h"
 #include <string.h>
 #include <math.h>
 #include "ogg.h"

apps/codecs/Tremor/floor1.c

@@ -15,7 +15,7 @@
 
  ********************************************************************/
 
-#include <stdlib.h>
+#include "config-tremor.h"
 #include <string.h>
 #include <math.h>
 #include "ogg.h"

apps/codecs/Tremor/framing.c

@@ -19,7 +19,7 @@
 
  ********************************************************************/
 
-#include <stdlib.h>
+#include "config-tremor.h"
 #include <string.h>
 #include "ogg.h"
 #include "misc.h"

apps/codecs/Tremor/info.c

@@ -18,7 +18,7 @@
 /* general handling of the header and the vorbis_info structure (and
    substructures) */
 
-#include <stdlib.h>
+#include "config-tremor.h"
 #include <string.h>
 #include <ctype.h>
 #include "ogg.h"

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 <stdio.h>
-#include <stdlib.h>
 #include <vorbis/ivorbiscodec.h>
 #include <vorbis/ivorbisfile.h>
 

apps/codecs/Tremor/mapping0.c

@@ -15,7 +15,7 @@
 
  ********************************************************************/
 
-#include <stdlib.h>
+#include "config-tremor.h"
 #include <stdio.h>
 #include <string.h>
 #include <math.h>

apps/codecs/Tremor/misc.h

@@ -26,7 +26,6 @@
   
 
 /* Some prototypes that were not defined elsewhere */
-#include <stdlib.h>
 void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
 void _vorbis_block_ripcord(vorbis_block *vb);
 extern int _ilog(unsigned int v);

apps/codecs/Tremor/res012.c

@@ -15,7 +15,7 @@
 
  ********************************************************************/
 
-#include <stdlib.h>
+#include "config-tremor.h"
 #include <string.h>
 #include <math.h>
 #include "ogg.h"

apps/codecs/Tremor/sharedbook.c

@@ -15,7 +15,7 @@
 
  ********************************************************************/
 
-#include <stdlib.h>
+#include "config-tremor.h"
 #include <math.h>
 #include <string.h>
 #include "ogg.h"

apps/codecs/Tremor/vorbisfile.c

@@ -16,7 +16,7 @@
 
  ********************************************************************/
 
-#include <stdlib.h>
+#include "config-tremor.h"
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>

apps/codecs/Tremor/window.c

@@ -15,7 +15,7 @@
 
  ********************************************************************/
 
-#include <stdlib.h>
+#include "config-tremor.h"
 #include <math.h>
 #include "os.h"
 #include "misc.h"

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 <sys/types.h>
+
+/* 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 *));
+

apps/codecs/libFLAC/bitbuffer.c

@@ -29,7 +29,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdlib.h> /* for malloc() */
+#include "global.h" /* for malloc() */
 #include <string.h> /* for memcpy(), memset() */
 #include "private/bitbuffer.h"
 #include "private/bitmath.h"

apps/codecs/libFLAC/cpu.c

@@ -30,7 +30,7 @@
  */
 
 #include "private/cpu.h"
-#include <stdlib.h>
+#include "global.h"
 #include <stdio.h>
 
 #ifdef HAVE_CONFIG_H

apps/codecs/libFLAC/file_decoder.c

@@ -30,7 +30,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h> /* for malloc() */
+#include "global.h" /* for malloc() */
 #include <string.h> /* for strcmp() */
 #include <sys/stat.h> /* for stat() */
 #if defined _MSC_VER || defined __MINGW32__

apps/codecs/libFLAC/file_encoder.c

@@ -30,7 +30,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h> /* for malloc() */
+#include "global.h" /* for malloc() */
 #include <string.h> /* for strlen(), strcpy() */
 #include "FLAC/assert.h"
 #include "protected/file_encoder.h"

apps/codecs/libFLAC/format.c

@@ -30,7 +30,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h> /* for qsort() */
+#include "global.h" /* for qsort() */
 #include "FLAC/assert.h"
 #include "FLAC/format.h"
 #include "private/format.h"

apps/codecs/libFLAC/include/FLAC/callback.h

@@ -33,7 +33,7 @@
 #define FLAC__CALLBACK_H
 
 #include "ordinals.h"
-#include <stdlib.h> /* for size_t */
+#include <sys/types.h> /* for size_t */
 
 /** \file include/FLAC/callback.h
  *

apps/codecs/libFLAC/include/global.h

@@ -0,0 +1,3 @@
+/* global include file for libFLAC/rockbox */
+
+#include "../../codec.h"

apps/codecs/libFLAC/include/private/memory.h

@@ -36,7 +36,7 @@
 #include <config.h>
 #endif
 
-#include <stdlib.h> /* for size_t */
+#include <sys/types.h> /* for size_t */
 
 #include "private/float.h"
 #include "FLAC/ordinals.h" /* for FLAC__bool */

apps/codecs/libFLAC/md5.c

@@ -23,7 +23,7 @@
  * Still in the public domain.
  */
 
-#include <stdlib.h>		/* for malloc() */
+#include "global.h"		/* for malloc() */
 #include <string.h>		/* for memcpy() */
 
 #include "private/md5.h"

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"
 

apps/codecs/libFLAC/metadata_iterators.c

@@ -31,7 +31,7 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include "global.h"
 #include <string.h>
 
 #if defined _MSC_VER || defined __MINGW32__

apps/codecs/libFLAC/metadata_object.c

@@ -29,7 +29,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdlib.h>
+#include "global.h"
 #include <string.h>
 
 #include "private/metadata.h"

apps/codecs/libFLAC/seekable_stream_decoder.c

@@ -30,7 +30,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h> /* for calloc() */
+#include "global.h" /* for calloc() */
 #include <string.h> /* for memcpy()/memcmp() */
 #include "FLAC/assert.h"
 #include "protected/seekable_stream_decoder.h"

apps/codecs/libFLAC/seekable_stream_encoder.c

@@ -30,7 +30,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h> /* for calloc() */
+#include "global.h" /* for calloc() */
 #include <string.h> /* for memcpy() */
 #include "FLAC/assert.h"
 #include "protected/seekable_stream_encoder.h"

apps/codecs/libFLAC/stream_decoder.c

@@ -30,7 +30,7 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h> /* for malloc() */
+#include "global.h" /* for malloc() */
 #include <string.h> /* for memset/memcpy() */
 #include "FLAC/assert.h"
 #include "protected/stream_decoder.h"

apps/codecs/libFLAC/stream_encoder.c

@@ -31,7 +31,7 @@
 
 #include <limits.h>
 #include <stdio.h>
-#include <stdlib.h> /* for malloc() */
+#include "global.h" /* for malloc() */
 #include <string.h> /* for memcpy() */
 #include "FLAC/assert.h"
 #include "FLAC/stream_decoder.h"

apps/codecs/liba52/config-a52.h

@@ -1,3 +1,5 @@
+#include "../codec.h"
+
 /* a52dec profiling */
 /* #undef A52DEC_GPROF */
 

apps/codecs/liba52/parse.c

@@ -23,7 +23,6 @@
 
 #include "config-a52.h"
 
-#include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
 

apps/codecs/libmad/decoder.c

@@ -41,8 +41,6 @@
 #  include <fcntl.h>
 # endif
 
-# include <stdlib.h>
-
 # ifdef HAVE_ERRNO_H
 #  include <errno.h>
 # endif

apps/codecs/libmad/frame.c

@@ -25,8 +25,6 @@
 
 # include "global.h"
 
-# include <stdlib.h>
-
 # include "bit.h"
 # include "stream.h"
 # include "frame.h"

apps/codecs/libmad/global.h

@@ -19,6 +19,8 @@
  * $Id$
  */
 
+#include "../codec.h"
+
 # ifndef LIBMAD_GLOBAL_H
 # define LIBMAD_GLOBAL_H
 

apps/codecs/libmad/layer3.c

@@ -25,7 +25,6 @@
 
 # include "global.h"
 
-# include <stdlib.h>
 # include <string.h>
 
 # ifdef HAVE_ASSERT_H

apps/codecs/libmad/stream.c

@@ -25,8 +25,6 @@
 
 # include "global.h"
 
-# include <stdlib.h>
-
 # include "bit.h"
 # include "stream.h"
 

apps/codecs/libwavpack/unpack.c

@@ -17,7 +17,6 @@
 
 #include <string.h>
 #include <math.h>
-#include <stdlib.h>
 
 #define LOSSY_MUTE
 

apps/codecs/libwavpack/wavpack.h

@@ -8,6 +8,8 @@
 
 // wavpack.h
 
+#include "../codec.h"
+
 #include <inttypes.h>
 
 // This header file contains all the definitions required by WavPack.

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);
 }
 

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);