Move the MEM_FUNCTION_WRAPPERS macro into plugin.h and get rid of the extra header file

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

12 files changed, 20 insertions, 54 deletions

diff --git a/apps/plugin.h b/apps/plugin.h
index 11bb80de66..606db6ebd6 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -679,4 +679,24 @@ void plugin_tsr(bool (*exit_callback)(bool reenter));
 enum plugin_status plugin_start(struct plugin_api* rockbox, void* parameter)
     NO_PROF_ATTR;
 
+/* Use this macro in plugins where gcc tries to optimize by calling
+ * these functions directly */
+#define MEM_FUNCTION_WRAPPERS(api) \
+        void *memcpy(void *dest, const void *src, size_t n) \
+        { \
+            return (api)->memcpy(dest, src, n); \
+        } \
+        void *memset(void *dest, int c, size_t n) \
+        { \
+            return (api)->memset(dest, c, n); \
+        } \
+        void *memmove(void *dest, const void *src, size_t n) \
+        { \
+            return (api)->memmove(dest, src, n); \
+        } \
+        int memcmp(const void *s1, const void *s2, size_t n) \
+        { \
+            return (api)->memcmp(s1, s2, n); \
+        }
+
 #endif
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index fef3f36db2..9a70fbf6a0 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -20,7 +20,6 @@
 #ifndef SIMULATOR /* not for the simulator */
 
 #include "plugin.h"
-#include "mem_function_wrappers.h"
 PLUGIN_HEADER
 
 #define BATTERY_LOG "/battery_bench.txt"
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index 07af984a80..1cce364125 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -20,7 +20,6 @@
 #include "plugin.h"
 #include "card_deck.h"
 #include "card_back.h"
-#include "mem_function_wrappers.h"
 
 PLUGIN_HEADER
 
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 3dfb0fef6c..6efaf44300 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -17,7 +17,6 @@
  *
  ****************************************************************************/
 #include "plugin.h"
-#include "mem_function_wrappers.h"
 
 PLUGIN_HEADER
 
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c
index cd364f4d51..f9275fb802 100644
--- a/apps/plugins/jpeg.c
+++ b/apps/plugins/jpeg.c
@@ -27,7 +27,6 @@
 #include "plugin.h"
 #include "playback_control.h"
 #include "oldmenuapi.h"
-#include "mem_function_wrappers.h"
 
 #ifdef HAVE_LCD_BITMAP
 #include "gray.h"
diff --git a/apps/plugins/lib/mem_function_wrappers.h b/apps/plugins/lib/mem_function_wrappers.h
deleted file mode 100644
index ec3872c4c1..0000000000
--- a/apps/plugins/lib/mem_function_wrappers.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Copyright (C) 2007 Nils Wallménius
- *
- * 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.
- *
- ****************************************************************************/
-#ifndef __MEM_FUNCTION_WRAPPERS_H__
-#define __MEM_FUNCTION_WRAPPERS_H__
-
-/* Use this macro in plugins where gcc tries to optimize by calling
- * these functions directly */
-
-#define MEM_FUNCTION_WRAPPERS(api) \
-        void *memcpy(void *dest, const void *src, size_t n) \
-        { \
-            return (api)->memcpy(dest, src, n); \
-        } \
-        void *memset(void *dest, int c, size_t n) \
-        { \
-            return (api)->memset(dest, c, n); \
-        } \
-        void *memmove(void *dest, const void *src, size_t n) \
-        { \
-            return (api)->memmove(dest, src, n); \
-        } \
-        int memcmp(const void *s1, const void *s2, size_t n) \
-        { \
-            return (api)->memcmp(s1, s2, n); \
-        }
-
-#endif /* __MEM_FUNCTION_WRAPPERS_H__ */
-
diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c
index ee93d10024..6f68f98e36 100644
--- a/apps/plugins/mazezam.c
+++ b/apps/plugins/mazezam.c
@@ -20,7 +20,6 @@
  ****************************************************************************/
 #include "plugin.h"
 #include "configfile.h"
-#include "mem_function_wrappers.h"
 
 /* Include standard plugin macro */
 PLUGIN_HEADER
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c
index daf3294b75..3255ad3b93 100644
--- a/apps/plugins/metronome.c
+++ b/apps/plugins/metronome.c
@@ -18,7 +18,6 @@
  ****************************************************************************/
 #include "plugin.h"
 #include "pluginlib_actions.h"
-#include "mem_function_wrappers.h"
 
 PLUGIN_HEADER
 
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index d1ef2e0a7c..8a4560a935 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -12,7 +12,6 @@
  *  Library General Public License for more details. */
 
 #include "plugin.h"
-#include "mem_function_wrappers.h"
 
 PLUGIN_HEADER
 PLUGIN_IRAM_DECLARE
diff --git a/apps/plugins/properties.c b/apps/plugins/properties.c
index 2e2e057b64..f58a412056 100644
--- a/apps/plugins/properties.c
+++ b/apps/plugins/properties.c
@@ -17,7 +17,6 @@
  *
  ****************************************************************************/
 #include "plugin.h"
-#include "mem_function_wrappers.h"
 
 PLUGIN_HEADER
 
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index 29296ac1b6..d478bf9947 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -30,7 +30,6 @@
 #include "errno.h"
 #include "lib/bmp.h"
 #include "lib/rgb_hsv.h"
-#include "mem_function_wrappers.h"
 
 PLUGIN_HEADER
 
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index 0d1bdc4f72..def11b3bb0 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -19,7 +19,6 @@
  ****************************************************************************/
 
 #include "plugin.h"
-#include "mem_function_wrappers.h"
 
 PLUGIN_HEADER