about summary refs log tree commit diff
path: root/malloc
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 /malloc
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 'malloc')
-rw-r--r--malloc/obstack.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/malloc/obstack.h b/malloc/obstack.h
index d2e056bf38..e786d1fef0 100644
--- a/malloc/obstack.h
+++ b/malloc/obstack.h
@@ -185,7 +185,7 @@ extern int _obstack_begin_1 (struct obstack *, int, int,
 			     void (*) (void *, void *), void *);
 extern int _obstack_memory_used (struct obstack *);
 
-void obstack_free (struct obstack *__obstack, void *__block);
+void obstack_free (struct obstack *__obstack, void *__glibc_block);
 
 
 /* Error handler called when `obstack_chunk_alloc' failed to allocate