Fix visibility of declarations of wcpcpy and wcpncpy.

diff --git a/ChangeLog b/ChangeLog
index c4cf882..f093d9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-01  Ulrich Drepper  <drepper@gmail.com>
+
+       [BZ #12631]
+       * wcsmbs/wchar.h: Make wcpcpy and wcpncpy visible for __USE_XOPEN2K8.
+
 2011-03-30  Andreas Schwab  <schwab@redhat.com>
 
        * misc/syncfs.c: New file.

diff --git a/NEWS b/NEWS
index 8aa9316..711e11f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,8 @@ Version 2.14
 
 * The following bugs are resolved with this release:
 
-  11724, 12445, 12454, 12460, 12469, 12489, 12509, 12510, 12583, 12587, 12597
+  11724, 12445, 12454, 12460, 12469, 12489, 12509, 12510, 12583, 12587, 12597,
+  12631
 \f
 Version 2.13
 

diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 886131b..80d7ae2 100644 (file)
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -554,8 +554,10 @@ extern float wcstof_l (__const wchar_t *__restrict __nptr,
 extern long double wcstold_l (__const wchar_t *__restrict __nptr,
                              wchar_t **__restrict __endptr,
                              __locale_t __loc) __THROW;
+#endif /* use GNU */
 
 
+#ifdef __USE_XOPEN2K8
 /* Copy SRC to DEST, returning the address of the terminating L'\0' in
    DEST.  */
 extern wchar_t *wcpcpy (wchar_t *__restrict __dest,
@@ -566,12 +568,10 @@ extern wchar_t *wcpcpy (wchar_t *__restrict __dest,
 extern wchar_t *wcpncpy (wchar_t *__restrict __dest,
                         __const wchar_t *__restrict __src, size_t __n)
      __THROW;
-#endif /* use GNU */
 
 
 /* Wide character I/O functions.  */
 
-#ifdef __USE_XOPEN2K8
 /* Like OPEN_MEMSTREAM, but the stream is wide oriented and produces
    a wide character string.  */
 extern __FILE *open_wmemstream (wchar_t **__bufloc, size_t *__sizeloc) __THROW;