diff options
| author | Franklin Wei <git@fwei.tk> | 2017-01-02 18:12:43 -0500 |
|---|---|---|
| committer | Gerrit Rockbox <gerrit@rockbox.org> | 2017-01-03 00:15:28 +0100 |
| commit | d7770a1cddeb94826046b9c58107f967e5462810 (patch) | |
| tree | 513d5cdc002c497caf9cd7ce14404e85514b1330 /apps/plugins | |
| parent | e25983607ce08f75a38a0689bdc4b74c69a1a619 (diff) | |
| download | rockbox-d7770a1cddeb94826046b9c58107f967e5462810.tar.gz rockbox-d7770a1cddeb94826046b9c58107f967e5462810.zip | |
puzzles: rename bcopy() to bcopy_wrapper() and make static
- fixes a name collision on linux
Change-Id: I9f162b5c8a1f319fa6495ff9343fb6007cc20edf
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/puzzles/rbwrappers.c | 4 |
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; | |||
| 1664 | 1664 | ||
| 1665 | static const u_char *__sccl(char *, const u_char *); | 1665 | static const u_char *__sccl(char *, const u_char *); |
| 1666 | 1666 | ||
| 1667 | void bcopy(const void *src, void *dst, size_t n) | 1667 | static void bcopy_wrapper(const void *src, void *dst, size_t n) |
| 1668 | { | 1668 | { |
| 1669 | memmove(dst, src, n); | 1669 | memmove(dst, src, n); |
| 1670 | } | 1670 | } |
| @@ -1889,7 +1889,7 @@ literal: | |||
| 1889 | } | 1889 | } |
| 1890 | nread += sum; | 1890 | nread += sum; |
| 1891 | } else { | 1891 | } else { |
| 1892 | bcopy(inp, va_arg(ap, char *), width); | 1892 | bcopy_wrapper(inp, va_arg(ap, char *), width); |
| 1893 | inr -= width; | 1893 | inr -= width; |
| 1894 | inp += width; | 1894 | inp += width; |
| 1895 | nread += width; | 1895 | nread += width; |