summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2009-10-14 22:34:11 +0000
committerNils Wallménius <nils@rockbox.org>2009-10-14 22:34:11 +0000
commitafe08ed8b2f15157f8c2561dc81a3c7a753aeaab (patch)
tree4ed3dbba88aeb72e9a6c869496c1c7e36560cafa
parenta5c1ee5cf1b12b419c28ed11df70d3d108a723f8 (diff)
downloadrockbox-afe08ed8b2f15157f8c2561dc81a3c7a753aeaab.tar.gz
rockbox-afe08ed8b2f15157f8c2561dc81a3c7a753aeaab.zip
Remove private memcpy wrapper that is no longer needed since r19847 and may cause issues with newer gcc versions, inspired by patch in FS#10676 by Duy Nguyen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23178 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/doom/rockdoom.c5
-rw-r--r--apps/plugins/doom/rockmacros.h3
2 files changed, 0 insertions, 8 deletions
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c
index 1d065cc981..a76c9379b3 100644
--- a/apps/plugins/doom/rockdoom.c
+++ b/apps/plugins/doom/rockdoom.c
@@ -181,11 +181,6 @@ cont:
181 /* NOTREACHED */ 181 /* NOTREACHED */
182} 182}
183 183
184inline void* memcpy(void* dst, const void* src, size_t size)
185{
186 return rb->memcpy(dst, src, size);
187}
188
189struct argvlist 184struct argvlist
190{ 185{
191 int timedemo; // 1 says there's a timedemo 186 int timedemo; // 1 says there's a timedemo
diff --git a/apps/plugins/doom/rockmacros.h b/apps/plugins/doom/rockmacros.h
index 1ead411b85..98f908dc1d 100644
--- a/apps/plugins/doom/rockmacros.h
+++ b/apps/plugins/doom/rockmacros.h
@@ -72,9 +72,6 @@ int my_close(int id);
72#define strcat(a,b) rb->strcat((a),(b)) 72#define strcat(a,b) rb->strcat((a),(b))
73#define snprintf rb->snprintf 73#define snprintf rb->snprintf
74 74
75/* Using #define isn't enough with GCC 4.0.1 */
76inline void* memcpy(void* dst, const void* src, size_t size);
77
78#define PACKEDATTR __attribute__((packed)) // Needed for a few things 75#define PACKEDATTR __attribute__((packed)) // Needed for a few things
79#define GAMEBASE ROCKBOX_DIR "/doom/" 76#define GAMEBASE ROCKBOX_DIR "/doom/"
80//#define SIMPLECHECKS 77//#define SIMPLECHECKS