From 50a6ca39ad4ed01922aa4f755f0ca579788226cf Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Thu, 6 May 2010 21:04:40 +0000 Subject: Move c/h files implementing/defining standard library stuff into a new libc directory, also standard'ify some parts of the code base (almost entirely #include fixes). This is to a) to cleanup firmware/common and firmware/include a bit, but also b) for Rockbox as an application which should use the host system's c library and headers, separating makes it easy to exclude our files from the build. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25850 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/lib/codeclib.h | 10 ++++++++-- apps/codecs/lib/tlsf/src/tlsf.c | 2 +- apps/codecs/lib/tlsf/src/tlsf.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'apps/codecs/lib') diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h index 817d86a6a3..b7685ebbcb 100644 --- a/apps/codecs/lib/codeclib.h +++ b/apps/codecs/lib/codeclib.h @@ -22,9 +22,10 @@ #ifndef __CODECLIB_H__ #define __CODECLIB_H__ +#include +#include #include "config.h" #include "codecs.h" -#include #include "mdct.h" #include "fft.h" @@ -44,6 +45,7 @@ extern unsigned char* filebuf; /* The rest of the MP3 buffer #define calloc(x,y) codec_calloc(x,y) #define realloc(x,y) codec_realloc(x,y) #define free(x) codec_free(x) +#undef alloca #define alloca(x) __builtin_alloca(x) void* codec_malloc(size_t size); @@ -59,7 +61,11 @@ void *memmove(void *s1, const void *s2, size_t n); size_t strlen(const char *s); char *strcpy(char *dest, const char *src); char *strcat(char *dest, const char *src); -int strcmp(const char *, const char *); + +/* on some platforms strcmp() seems to be a tricky define which + * breaks if we write down strcmp's prototype */ +#undef strcmp +int strcmp(const char *s1, const char *s2); void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *)); diff --git a/apps/codecs/lib/tlsf/src/tlsf.c b/apps/codecs/lib/tlsf/src/tlsf.c index 6d15c3a3f6..570e472607 100644 --- a/apps/codecs/lib/tlsf/src/tlsf.c +++ b/apps/codecs/lib/tlsf/src/tlsf.c @@ -165,7 +165,7 @@ #endif #if defined(ROCKBOX) && defined(SIMULATOR) || !defined(ROCKBOX) -int printf(char*, ...); +int printf(const char* fmt, ...); #define PRINT_MSG(fmt, args...) printf(fmt, ## args) #define ERROR_MSG(fmt, args...) printf(fmt, ## args) #else diff --git a/apps/codecs/lib/tlsf/src/tlsf.h b/apps/codecs/lib/tlsf/src/tlsf.h index 5d016f4369..4feb5c42cc 100644 --- a/apps/codecs/lib/tlsf/src/tlsf.h +++ b/apps/codecs/lib/tlsf/src/tlsf.h @@ -19,7 +19,7 @@ #ifndef _TLSF_H_ #define _TLSF_H_ -#include +#include /* defines size_t */ extern size_t init_memory_pool(size_t, void *); extern size_t get_used_size(void *); -- cgit v1.2.3