aboutsummaryrefslogtreecommitdiff
path: root/crypt
diff options
context:
space:
mode:
authorMeador Inge <meadori@codesourcery.com>2013-11-21 16:57:37 -0500
committerCarlos O'Donell <carlos@redhat.com>2013-11-21 16:57:37 -0500
commit84ae135d3282dc362bed0a5c9a575319ef336884 (patch)
tree7c4c9f708d588755467680506a37b7829fcd1ad7 /crypt
parentdaf75146de07303ea0c5ad700ec5ef703ec114a1 (diff)
downloadglibc-84ae135d3282dc362bed0a5c9a575319ef336884.zip
glibc-84ae135d3282dc362bed0a5c9a575319ef336884.tar.gz
glibc-84ae135d3282dc362bed0a5c9a575319ef336884.tar.bz2
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 'crypt')
-rw-r--r--crypt/crypt.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/crypt/crypt.h b/crypt/crypt.h
index 985720b..e0d37b5 100644
--- a/crypt/crypt.h
+++ b/crypt/crypt.h
@@ -37,7 +37,8 @@ extern void setkey (const char *__key) __THROW __nonnull ((1));
/* 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));
#ifdef __USE_GNU
/* Reentrant versions of the functions above. The additional argument
@@ -64,7 +65,7 @@ extern void setkey_r (const char *__key,
struct crypt_data * __restrict __data)
__THROW __nonnull ((1, 2));
-extern void encrypt_r (char *__block, int __edflag,
+extern void encrypt_r (char *__glibc_block, int __edflag,
struct crypt_data * __restrict __data)
__THROW __nonnull ((1, 3));
#endif