Fix warning on Cygwin.

diff --git a/gettext-tools/libgrep/ChangeLog b/gettext-tools/libgrep/ChangeLog
index 7b3a647e5f7e8df1e4d3c710fcd3de0569b8031c..558f80fd91ce7d6e54cd643e3a85c807dce13fc9 100644 (file)
--- a/gettext-tools/libgrep/ChangeLog
+++ b/gettext-tools/libgrep/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-16  Bruno Haible  <bruno@clisp.org>
+
+       * regex.c (mempcpy) [_LIBC]: New macro.
+       (regerror): Use it instead of __mempcpy.
+
 2005-10-06  Bruno Haible  <bruno@clisp.org>
 
        * hard-locale.c: Test HAVE_CONFIG_H using #ifdef.

diff --git a/gettext-tools/libgrep/regex.c b/gettext-tools/libgrep/regex.c
index 1b07a9627aed83c9fa23d79b691fdb46c21b86d6..aec323ae8de15592b8adfc14e4a57dbf0c0fc1f8 100644 (file)
--- a/gettext-tools/libgrep/regex.c
+++ b/gettext-tools/libgrep/regex.c
@@ -4,7 +4,7 @@
    internationalization features.)
 
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -74,6 +74,7 @@
 #  define wcslen __wcslen
 #  define wcscoll __wcscoll
 #  define wcrtomb __wcrtomb
+#  define mempcpy __mempcpy
 
 /* We are also using some library internals.  */
 #  include <locale/localeinfo.h>
@@ -8179,7 +8180,7 @@ regerror (int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)
       if (msg_size > errbuf_size)
         {
 #if defined HAVE_MEMPCPY || defined _LIBC
-         *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
+         *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
 #else
           memcpy (errbuf, msg, errbuf_size - 1);
           errbuf[errbuf_size - 1] = 0;