From 24de042d6ca27dd0ffe72e901ce35d81d54ffed1 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 1 Feb 2007 13:41:12 +0000 Subject: [PATCH] * modules/regex (Depends-on): Revert dependence on mempcpy. * lib/regex_internal.h [! _LIBC && !__mempcpy]: Undo string module's definition of mempcpy. Reported by Paul Eggert. --- ChangeLog | 9 ++++++++- lib/regex_internal.h | 1 + modules/regex | 1 - 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 504763921a..2b2b838d97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-02-01 Eric Blake + + * modules/regex (Depends-on): Revert dependence on mempcpy. + * lib/regex_internal.h [! _LIBC && !__mempcpy]: Undo string + module's definition of mempcpy. + Reported by Paul Eggert. + 2007-02-01 Paul Eggert * lib/string_.h: If the gnulib module XYZ is not present, undefine @@ -16,7 +23,7 @@ 2007-01-31 Eric Blake - * modules/mountlist (Depends-on): Add strstr + * modules/mountlist (Depends-on): Add strstr. * m4/string_h.m4 (gl_STRING_MODULE_INDICATOR): Correct m4 usage bug. diff --git a/lib/regex_internal.h b/lib/regex_internal.h index bd12572f48..50d6b05e68 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -113,6 +113,7 @@ # define __iswctype iswctype # define __btowc btowc # ifndef __mempcpy +# undef mempcpy # define __mempcpy mempcpy # endif # define __wcrtomb wcrtomb diff --git a/modules/regex b/modules/regex index 81e9fd7d1f..5d7d263d92 100644 --- a/modules/regex +++ b/modules/regex @@ -16,7 +16,6 @@ alloca extensions gettext-h malloc -mempcpy stdint strcase ssize_t -- 2.30.2