Bruno Haible <br...@clisp.org> wrote: > Also, the test for mempcpy is redundant since nothing uses it. Proposed patch:
That looks fine, and you're welcome to apply it. I'm generally in favor of clean-up changes in strftime.c, as long as they're not too invasive. Thinking of merge work, I see that there are some changes in libc's strftime.c that should probably be merged into gnulib's version... eventually. > 2009-01-01 Bruno Haible <br...@clisp.org> > > * lib/strftime.c (MEMPCPY): Remove unused macro. > * m4/strftime.m4 (gl_FUNC_STRFTIME): Don't test for mempcpy. > > --- lib/strftime.c.orig 2009-01-02 03:23:07.000000000 +0100 > +++ lib/strftime.c 2009-01-02 03:22:45.000000000 +0100 > @@ -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. > @@ -86,13 +86,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 > --- m4/strftime.m4.orig 2009-01-02 03:23:07.000000000 +0100 > +++ m4/strftime.m4 2009-01-02 03:22:52.000000000 +0100 > @@ -1,7 +1,7 @@ > -#serial 29 > +#serial 30 > > # Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005, > -# 2006, 2007 Free Software Foundation, Inc. > +# 2006, 2007, 2009 Free Software Foundation, Inc. > # > # This file is free software; the Free Software Foundation > # gives unlimited permission to copy and/or distribute it, > @@ -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],