Check for memcpy and don't redefine if found

Spotted by cppcheck, from Riccardo Magliocchetti.

diff --git a/configure.ac b/configure.ac
index 116c3fa55ecd769b11eeba4de763b2151500bf78..bfb578cae8108a7aa947a18cd395f2efad5384e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, [#include <time.h>])
 
 dnl these tests have been comfirmed to be needed in 2011
 AC_CHECK_FUNCS(backtrace_symbols dirfd getusershell pread pwrite pselect)
-AC_CHECK_FUNCS(setlinebuf strlcat strlcpy strnlen)
+AC_CHECK_FUNCS(setlinebuf strlcat strlcpy strnlen mempcpy)
 AC_CHECK_FUNCS(mmap utime getpagesize) dnl needed by tbd
 
 dnl search for necessary libraries

diff --git a/libatalk/util/ftw.c b/libatalk/util/ftw.c
index 3a32c12e0293a35329a95bef956c5000646c6eb4..f0ac17f1b41be54dc9ee86c091a96799c6bc2d36 100644 (file)
--- a/libatalk/util/ftw.c
+++ b/libatalk/util/ftw.c
@@ -45,7 +45,9 @@
 
 #include <atalk/ftw.h>
 
+#ifndef HAVE_MEMPCPY
 #define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N)))
+#endif
 
 #define NDEBUG 1
 #include <assert.h>