# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1232311606 -3600
# Node ID 3da9b6c857c211c84a134a9e243dc783062db7fb
# Parent  894d336e6216571dd7c8617bd49d16b112f3fb02
Remove unused code for mempcpy.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-18  Bruno Haible  <bruno@clisp.org>
+
+	* lib/strftime.c (MEMPCPY): Remove unused macro.
+	* m4/strftime.m4 (gl_FUNC_STRFTIME): Don't test for mempcpy.
+
 2009-01-18  Martin Lambers  <marlam@marlam.de>
 
 	New module 'link'.
diff --git a/lib/strftime.c b/lib/strftime.c
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 Free Software
+/* Copyright (C) 1991-1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2009 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
@@ -79,13 +79,6 @@
 # define MEMCPY(d, s, n) memcpy (d, s, n)
 # define STRLEN(s) strlen (s)
 
-# ifdef _LIBC
-#  define MEMPCPY(d, s, n) __mempcpy (d, s, n)
-# else
-#  ifndef HAVE_MEMPCPY
-#   define MEMPCPY(d, s, n) ((void *) ((char *) memcpy (d, s, n) + (n)))
-#  endif
-# endif
 #endif
 
 /* Shift A right by B bits portably, by dividing A by 2**B and
diff --git a/m4/strftime.m4 b/m4/strftime.m4
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@@ -1,4 +1,4 @@
-# serial 30
+# serial 31
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 # 2006, 2007, 2009 Free Software Foundation, Inc.
@@ -25,7 +25,7 @@
  AC_REQUIRE([AC_TYPE_MBSTATE_T])
  AC_REQUIRE([gl_TM_GMTOFF])
 
- AC_CHECK_FUNCS_ONCE([mblen mbrlen mempcpy tzset])
+ AC_CHECK_FUNCS_ONCE([mblen mbrlen tzset])
  AC_CHECK_HEADERS_ONCE([wchar.h])
 
  AC_DEFINE([my_strftime], [nstrftime],