diff options
author | Ron Yorston <rmy@pobox.com> | 2017-08-23 20:05:31 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2017-08-23 20:05:31 +0100 |
commit | 8efbd67183ccc98ce343ea0c69b62c8b75573c9f (patch) | |
tree | 751dbf01c4073394fdd4dbb87bbb6bcf92cd5719 /win32 | |
parent | 0f8d2b47dc78f9915a9ccdec29ef5c148011d583 (diff) | |
download | busybox-w32-8efbd67183ccc98ce343ea0c69b62c8b75573c9f.tar.gz busybox-w32-8efbd67183ccc98ce343ea0c69b62c8b75573c9f.tar.bz2 busybox-w32-8efbd67183ccc98ce343ea0c69b62c8b75573c9f.zip |
win32: remove implementation of mempcpy
mingw-w64 has its own mempcpy. And even if it didn't upstream
BusyBox has one too. So we definitely don't need our own.
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Kbuild | 1 | ||||
-rw-r--r-- | win32/mempcpy.c | 27 |
2 files changed, 0 insertions, 28 deletions
diff --git a/win32/Kbuild b/win32/Kbuild index ba361f1ca..b2b43b290 100644 --- a/win32/Kbuild +++ b/win32/Kbuild | |||
@@ -16,7 +16,6 @@ lib-$(CONFIG_PLATFORM_MINGW32) += poll.o | |||
16 | lib-$(CONFIG_PLATFORM_MINGW32) += select.o | 16 | lib-$(CONFIG_PLATFORM_MINGW32) += select.o |
17 | lib-$(CONFIG_PLATFORM_MINGW32) += popen.o | 17 | lib-$(CONFIG_PLATFORM_MINGW32) += popen.o |
18 | lib-$(CONFIG_PLATFORM_MINGW32) += statfs.o | 18 | lib-$(CONFIG_PLATFORM_MINGW32) += statfs.o |
19 | lib-$(CONFIG_PLATFORM_MINGW32) += mempcpy.o | ||
20 | lib-$(CONFIG_PLATFORM_MINGW32) += mntent.o | 19 | lib-$(CONFIG_PLATFORM_MINGW32) += mntent.o |
21 | lib-$(CONFIG_PLATFORM_MINGW32) += strptime.o | 20 | lib-$(CONFIG_PLATFORM_MINGW32) += strptime.o |
22 | lib-$(CONFIG_PLATFORM_MINGW32) += system.o | 21 | lib-$(CONFIG_PLATFORM_MINGW32) += system.o |
diff --git a/win32/mempcpy.c b/win32/mempcpy.c deleted file mode 100644 index 732a6f4b2..000000000 --- a/win32/mempcpy.c +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | /* Copy memory area and return pointer after last written byte. | ||
2 | Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc. | ||
3 | |||
4 | This program is free software; you can redistribute it and/or modify | ||
5 | it under the terms of the GNU General Public License as published by | ||
6 | the Free Software Foundation; either version 2, or (at your option) | ||
7 | any later version. | ||
8 | |||
9 | This program is distributed in the hope that it will be useful, | ||
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | GNU General Public License for more details. | ||
13 | |||
14 | You should have received a copy of the GNU General Public License | ||
15 | along with this program; if not, see <http://www.gnu.org/licenses/>. */ | ||
16 | |||
17 | #include "libbb.h" | ||
18 | /* Specification. */ | ||
19 | #include <string.h> | ||
20 | |||
21 | /* Copy N bytes of SRC to DEST, return pointer to bytes after the | ||
22 | last written byte. */ | ||
23 | void * | ||
24 | mempcpy (void *dest, const void *src, size_t n) | ||
25 | { | ||
26 | return (char *) memcpy (dest, src, n) + n; | ||
27 | } | ||