* 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.

diff --git a/ChangeLog b/ChangeLog
index 504763921a22c57e139f5cc4710acb9e5ce6f50a..2b2b838d97ec87f94638e40f051720cfc01cf742 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-01  Eric Blake  <ebb9@byu.net>
+
+       * 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  <eggert@cs.ucla.edu>
 
        * lib/string_.h: If the gnulib module XYZ is not present, undefine
@@ -16,7 +23,7 @@
 
 2007-01-31  Eric Blake  <ebb9@byu.net>
 
-       * 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 bd12572f489d85aac91b8a7509d87b715a91769b..50d6b05e6802e54c63e039e664e3bf6704fba37d 100644 (file)
--- 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 81e9fd7d1f10aef2f419ebf0aecc6d1f288dcdba..5d7d263d924e5ba64592cfd8af6ac9e332ac4e6e 100644 (file)
--- a/modules/regex
+++ b/modules/regex
@@ -16,7 +16,6 @@ alloca
 extensions
 gettext-h
 malloc
-mempcpy
 stdint
 strcase
 ssize_t