summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-12-10 09:16:12 -0500
committerAndreas Schwab <schwab@redhat.com>2010-12-13 11:43:08 +0100
commit255eab5f5ef8fec5187f4a611a89cc28f0ed7d1b (patch)
treedd1bd97b70f151361486bcc37a22e1f0ed038484
parent92111c633273b228bbce9564108a50499435c5ee (diff)
Declare wcpcpy and wcpncpy only under _GNU_SOURCE
(cherry picked from commit dbb0472f054a4241feec09af30db850dd4d18a7b)
-rw-r--r--ChangeLog5
-rw-r--r--wcsmbs/wchar.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 18023b9ded..2122312f4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2010-12-10 Andreas Schwab <schwab@redhat.com>
+ * wcsmbs/wchar.h (wcpcpy, wcpncpy): Only declare under
+ _GNU_SOURCE.
+
+2010-12-10 Andreas Schwab <schwab@redhat.com>
+
* wcsmbs/wchar.h (wcpcpy, wcpncpy): Add __restrict.
* wcsmbs/bits/wchar2.h (__wmemmove_chk_warn, wmemmove, wmemset):
Remove __restrict.
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index ca8ba8029a..5f341f3991 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -555,10 +555,8 @@ 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 /* 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,