about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-12-10 09:16:12 -0500
committerUlrich Drepper <drepper@gmail.com>2010-12-10 09:16:12 -0500
commitdbb0472f054a4241feec09af30db850dd4d18a7b (patch)
tree6beb88dda189c77af6c754c28c7e8d8d5b83e401
parent4f1972374a080e823c4ead7c0496827dfc013837 (diff)
downloadglibc-dbb0472f054a4241feec09af30db850dd4d18a7b.tar.gz
glibc-dbb0472f054a4241feec09af30db850dd4d18a7b.tar.xz
glibc-dbb0472f054a4241feec09af30db850dd4d18a7b.zip
Declare wcpcpy and wcpncpy only under _GNU_SOURCE
-rw-r--r--ChangeLog3
-rw-r--r--wcsmbs/wchar.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b1cd39a26e..7cd6d640f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-12-10  Andreas Schwab  <schwab@redhat.com>
 
+	* wcsmbs/wchar.h (wcpcpy, wcpncpy): Only declare under
+	_GNU_SOURCE.
+
 	* 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,