summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFranklin Wei <git@fwei.tk>2017-01-02 18:12:43 -0500
committerGerrit Rockbox <gerrit@rockbox.org>2017-01-03 00:15:28 +0100
commitd7770a1cddeb94826046b9c58107f967e5462810 (patch)
tree513d5cdc002c497caf9cd7ce14404e85514b1330
parente25983607ce08f75a38a0689bdc4b74c69a1a619 (diff)
downloadrockbox-d7770a1.tar.gz
rockbox-d7770a1.zip
puzzles: rename bcopy() to bcopy_wrapper() and make static
- fixes a name collision on linux Change-Id: I9f162b5c8a1f319fa6495ff9343fb6007cc20edf
-rw-r--r--apps/plugins/puzzles/rbwrappers.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugins/puzzles/rbwrappers.c b/apps/plugins/puzzles/rbwrappers.c
index 8eca1909c3..b553a66dfc 100644
--- a/apps/plugins/puzzles/rbwrappers.c
+++ b/apps/plugins/puzzles/rbwrappers.c
@@ -1664,7 +1664,7 @@ typedef uint64_t u_quad_t;
static const u_char *__sccl(char *, const u_char *);
-void bcopy(const void *src, void *dst, size_t n)
+static void bcopy_wrapper(const void *src, void *dst, size_t n)
{
memmove(dst, src, n);
}
@@ -1889,7 +1889,7 @@ literal:
}
nread += sum;
} else {
- bcopy(inp, va_arg(ap, char *), width);
+ bcopy_wrapper(inp, va_arg(ap, char *), width);
inr -= width;
inp += width;
nread += width;