From 8efbd67183ccc98ce343ea0c69b62c8b75573c9f Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Wed, 23 Aug 2017 20:05:31 +0100 Subject: 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. --- win32/Kbuild | 1 - win32/mempcpy.c | 27 --------------------------- 2 files changed, 28 deletions(-) delete mode 100644 win32/mempcpy.c (limited to 'win32') 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 lib-$(CONFIG_PLATFORM_MINGW32) += select.o lib-$(CONFIG_PLATFORM_MINGW32) += popen.o lib-$(CONFIG_PLATFORM_MINGW32) += statfs.o -lib-$(CONFIG_PLATFORM_MINGW32) += mempcpy.o lib-$(CONFIG_PLATFORM_MINGW32) += mntent.o lib-$(CONFIG_PLATFORM_MINGW32) += strptime.o 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 @@ -/* Copy memory area and return pointer after last written byte. - Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see . */ - -#include "libbb.h" -/* Specification. */ -#include - -/* Copy N bytes of SRC to DEST, return pointer to bytes after the - last written byte. */ -void * -mempcpy (void *dest, const void *src, size_t n) -{ - return (char *) memcpy (dest, src, n) + n; -} -- cgit v1.2.3-55-g6feb