From: Eric Blake <ebb9@byu.net>
Date: Thu, 1 Feb 2007 13:41:12 +0000 (+0000)
Subject: * modules/regex (Depends-on): Revert dependence on mempcpy.
X-Git-Tag: cvs-readonly~1157
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=24de042d6ca27dd0ffe72e901ce35d81d54ffed1;p=gnulib.git

* 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 504763921..2b2b838d9 100644
--- 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 bd12572f4..50d6b05e6 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 81e9fd7d1..5d7d263d9 100644
--- a/modules/regex
+++ b/modules/regex
@@ -16,7 +16,6 @@ alloca
 extensions
 gettext-h
 malloc
-mempcpy
 stdint
 strcase
 ssize_t