From afe08ed8b2f15157f8c2561dc81a3c7a753aeaab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= Date: Wed, 14 Oct 2009 22:34:11 +0000 Subject: [PATCH] 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 --- apps/plugins/doom/rockdoom.c | 5 ----- apps/plugins/doom/rockmacros.h | 3 --- 2 files changed, 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: /* NOTREACHED */ } -inline void* memcpy(void* dst, const void* src, size_t size) -{ - return rb->memcpy(dst, src, size); -} - struct argvlist { 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); #define strcat(a,b) rb->strcat((a),(b)) #define snprintf rb->snprintf -/* Using #define isn't enough with GCC 4.0.1 */ -inline void* memcpy(void* dst, const void* src, size_t size); - #define PACKEDATTR __attribute__((packed)) // Needed for a few things #define GAMEBASE ROCKBOX_DIR "/doom/" //#define SIMPLECHECKS