From aa6ddafcff28b21dbd3328839fedbfab1b5b5498 Mon Sep 17 00:00:00 2001
From: Ralph Boehme <sloowfranklin@gmail.com>
Date: Wed, 2 Jan 2013 18:09:51 +0100
Subject: [PATCH] Check for memcpy and don't redefine if found

Spotted by cppcheck, from Riccardo Magliocchetti.
---
 configure.ac        | 2 +-
 libatalk/util/ftw.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 116c3fa5..bfb578ca 100644
--- 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 3a32c12e..f0ac17f1 100644
--- 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>
-- 
2.39.2