about summary refs log tree commit diff
path: root/ChangeLog
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 /ChangeLog
parentdaf75146de07303ea0c5ad700ec5ef703ec114a1 (diff)
downloadglibc-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 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a6a21a2bcf..6f8a0215cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-11-21  Meador Inge  <meadori@codesourcery.com>
+
+	[BZ #11157]
+	* crypt/crypt.h (encrypt): Use __glibc_block instead of __block.
+	(encrypt_r): Likewise.
+	* malloc/obstack.h (obstack_free): Likewise.
+	* posix/unistd.h (encrypt): Likewise.
+
 2013-11-21  Guy Martin  <gmsoft@tuxicoman.be>
 
 	* sysdeps/generic/ldsodefs.h: Replace DL_DT_INIT_ADDRESS() and