From 84ae135d3282dc362bed0a5c9a575319ef336884 Mon Sep 17 00:00:00 2001 From: Meador Inge Date: Thu, 21 Nov 2013 16:57:37 -0500 Subject: Use __glibc_block in public headers. As detailed in PR11157, the use of '__block' is known to interfere with keywords in some environments, such as the Clang -fblocks extension. Recently a similar issue was raised concerning the use of '__unused' and a '__glibc' prefix was proposed to create a glibc implementation namespace for these sorts of issues [1]. This patches takes that approach. [1] https://sourceware.org/ml/libc-alpha/2012-02/msg00047.html [2] http://lists.debian.org/debian-glibc/2013/11/msg00020.html --- posix/unistd.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'posix') diff --git a/posix/unistd.h b/posix/unistd.h index 178223d..d4eeaf1 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -1144,7 +1144,8 @@ extern char *crypt (const char *__key, const char *__salt) /* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt block in place. */ -extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1)); +extern void encrypt (char *__glibc_block, int __edflag) + __THROW __nonnull ((1)); /* Swab pairs bytes in the first N bytes of the area pointed to by -- cgit v1.1