iRiver: Make it possible to build Rockbox using GCC 4.0.1.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7569 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 9 insertions, 1 deletions

diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index f389accd51..f3dd334848 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -75,6 +75,13 @@ void *my_malloc(size_t size)
     return alloc;
 }
 
+/* Using #define isn't enough with GCC 4.0.1 */
+
+void* memcpy(void* dst, const void* src, size_t size)
+{
+    return rb->memcpy(dst, src, size);
+}
+
 void setmallocpos(void *pointer) 
 {
     audio_bufferpointer = pointer;
diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h
index 71acfdbbcc..9e902e7dca 100644
--- a/apps/plugins/rockboy/rockmacros.h
+++ b/apps/plugins/rockboy/rockmacros.h
@@ -75,7 +75,6 @@ void savestate(int fd);
 #define read(a,b,c)     rb->read((a),(b),(c))
 #define write(a,b,c)    rb->write((a),(b),(c))
 #define memset(a,b,c)   rb->memset((a),(b),(c))
-#define memcpy(a,b,c)   rb->memcpy((a),(b),(c))
 #define strcpy(a,b)     rb->strcpy((a),(b))
 #define strncpy(a,b,c)  rb->strncpy((a),(b),(c))
 #define strlen(a)       rb->strlen((a))
@@ -91,3 +90,5 @@ void savestate(int fd);
 #define fdprintf(...)    rb->fdprintf(__VA_ARGS__)
 #define tolower(_A_)    (isupper(_A_) ? (_A_ - 'A' + 'a') : _A_)
 
+/* Using #define isn't enough with GCC 4.0.1 */
+void* memcpy(void* dst, const void* src, size_t size);