diff options
| author | Meador Inge <meadori@codesourcery.com> | 2013-11-21 16:57:37 -0500 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2013-11-21 16:57:37 -0500 |
| commit | 84ae135d3282dc362bed0a5c9a575319ef336884 (patch) | |
| tree | 7c4c9f708d588755467680506a37b7829fcd1ad7 /posix/unistd.h | |
| parent | daf75146de07303ea0c5ad700ec5ef703ec114a1 (diff) | |
| download | glibc-84ae135d3282dc362bed0a5c9a575319ef336884.tar.gz glibc-84ae135d3282dc362bed0a5c9a575319ef336884.tar.xz glibc-84ae135d3282dc362bed0a5c9a575319ef336884.zip | |
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
Diffstat (limited to 'posix/unistd.h')
| -rw-r--r-- | posix/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/posix/unistd.h b/posix/unistd.h index 178223d755..d4eeaf1433 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 |